spelling fixes for GUI (#372)

* clion spelling fixes for GUI.

Care must be taken to not lose translations!

* fix clang tidy performance-unnecessary-value-param

diff --git a/gui/advui.ui b/gui/advui.ui
index 11596c4f7c2b4f0eb70a176e67023ee25bed1cec..d1e031fc261349d548a2816991f0c9e47b936090 100644 (file)
--- a/gui/advui.ui
+++ b/gui/advui.ui
@@ -50,7 +50,7 @@
       <widget class="QComboBox" name="debugCombo">
        <property name="toolTip">
         <string>Debugging diagnostics.  
-Higher number provides more deitaled diagnostics.</string>
+Higher number provides more detailed diagnostics.</string>
        </property>
        <item>
         <property name="text">

diff --git a/gui/format.h b/gui/format.h
index 9954d492d88b0ed7b29fa46d48e86d596268ac03..0a2786495898d783b9556fd0e3492ec273c7b97f 100644 (file)
--- a/gui/format.h
+++ b/gui/format.h
@@ -58,7 +58,7 @@ public:
     defaultValue_(defaultValue), minValue_(minValue), maxValue_(maxValue), html_(html)
   {
     value_ = QVariant();
-    // Boolean values pay more atention to 'selected' than value.  Make
+    // Boolean values pay more attention to 'selected' than value.  Make
     // them match here. For non-bools, just make them unchecked.
     if (type_ == OPTbool && defaultValue.toBool() == true) {
       isSelected_ = true;
@@ -166,7 +166,7 @@ public:
          bool fileFormat, bool deviceFormat,
          const QStringList& extensions,
          QList<FormatOption>& inputOptions,
-         QList<FormatOption>& outputptions,
+         QList<FormatOption>& outputOptions,
          const QString& html):
     name_(name), description_(description),
     readWaypoints_(readWaypoints), readTracks_(readTracks), readRoutes_(readRoutes),
@@ -175,7 +175,7 @@ public:
     hidden_(false),
     extensions_(extensions),
     inputOptions_(inputOptions),
-    outputOptions_(outputptions),
+    outputOptions_(outputOptions),
     html_(QString()),
     readUseCount_(0),
     writeUseCount_(0)

diff --git a/gui/gpsbabelfe_de.qm b/gui/gpsbabelfe_de.qm
index a877e18912c3d9be13ae5835794a617bcf3073cb..2e6800a3443ae1beb29f1a31dffe016725d41905 100644 (file)
Binary files a/gui/gpsbabelfe_de.qm and b/gui/gpsbabelfe_de.qm differ

diff --git a/gui/gpsbabelfe_de.ts b/gui/gpsbabelfe_de.ts
index 930a8bbc94f4eb36eabec0dbb98b00dbaa40fbb7..9c7091b55e0bf668d4bc886a22eeb724d4ae6431 100644 (file)
--- a/gui/gpsbabelfe_de.ts
+++ b/gui/gpsbabelfe_de.ts
@@ -160,7 +160,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="advui.ui" line="52"/>
         <source>Debugging diagnostics.  
-Higher number provides more deitaled diagnostics.</source>
+Higher number provides more detailed diagnostics.</source>
         <translation>Fehlersuche:
 grössere Zahl bedeutet detailliertere Diagnosebeschreibungen.</translation>
     </message>
@@ -488,17 +488,17 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">default</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="565"/>
+        <location filename="mainwindow.cc" line="563"/>
         <source>Select one or more input files</source>
         <translation>eine oder mehrere Originaldateien markieren</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="593"/>
+        <location filename="mainwindow.cc" line="591"/>
         <source>Output File Name</source>
         <translation>Zieldatei-Name</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="657"/>
+        <location filename="mainwindow.cc" line="655"/>
         <source>Error reading format configuration.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
@@ -507,7 +507,7 @@ This program cannot continue.</source>
 Das Programm muss abgebrochen werden.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="668"/>
+        <location filename="mainwindow.cc" line="666"/>
         <source>Some file/device formats were not found during initialization.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
@@ -516,7 +516,7 @@ This program cannot continue.</source>
 Das Prgramm muss abgebrochen werden.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="689"/>
+        <location filename="mainwindow.cc" line="687"/>
         <source>Input and output formats do not support %1</source>
         <translation>Keine Unterstützung für %1 im Ein- oder Ausgabeformat</translation>
     </message>
@@ -529,109 +529,109 @@ Das Prgramm muss abgebrochen werden.</translation>
         <translation type="vanished">Eingabeformat  unterstützt %1. Keine Unterstützung für %2 im Ausgabeformat</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="692"/>
+        <location filename="mainwindow.cc" line="690"/>
         <source>Input does not support %1; output format supports %1</source>
         <translation type="unfinished">Keine Unterstützung für %1 im Eingabeformat; Ausgabeformat unterstützt %1 {1;?}</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="695"/>
+        <location filename="mainwindow.cc" line="693"/>
         <source>Input format supports %1; output format does not support %1</source>
         <translation type="unfinished">Eingabeformat  unterstützt %1. Keine Unterstützung für %1 im Ausgabeformat {1;?}</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="698"/>
+        <location filename="mainwindow.cc" line="696"/>
         <source>Both input and output formats support %1</source>
         <translation>Ein- und Ausgabeformat unterstützen %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="719"/>
+        <location filename="mainwindow.cc" line="717"/>
         <source>waypoints</source>
         <translation>Wegpunkte</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="720"/>
+        <location filename="mainwindow.cc" line="718"/>
         <source>tracks</source>
         <translation>tracks</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="721"/>
+        <location filename="mainwindow.cc" line="719"/>
         <source>routes</source>
         <translation>Routen</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="816"/>
+        <location filename="mainwindow.cc" line="814"/>
         <source>There are no input options for format &quot;%1&quot;</source>
         <translation>Es gibt keine Eingabeoptionen für das Format &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="822"/>
-        <location filename="mainwindow.cc" line="841"/>
+        <location filename="mainwindow.cc" line="820"/>
+        <location filename="mainwindow.cc" line="839"/>
         <source>Options for %1</source>
         <translation>Optionen für %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="835"/>
+        <location filename="mainwindow.cc" line="833"/>
         <source>There are no output options for format &quot;%1&quot;</source>
         <translation>Es gibt keine Ausgabeoptionen für das Format &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="855"/>
+        <location filename="mainwindow.cc" line="853"/>
         <source>No valid waypoints/routes/tracks translation specified</source>
         <translation>keine gültige Angabe von Wegpunkt-/Routen-/Trackfiltern</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="874"/>
+        <location filename="mainwindow.cc" line="872"/>
         <source>No input file specified</source>
         <translation>keine Quelldatei angegeben</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="881"/>
+        <location filename="mainwindow.cc" line="879"/>
         <source>No valid output specified</source>
         <translation>keine gültiges Ziel angegeben</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="886"/>
+        <location filename="mainwindow.cc" line="884"/>
         <source>No output file specified</source>
         <translation>keine Zieldatei angegeben</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="902"/>
+        <location filename="mainwindow.cc" line="900"/>
         <source>Process &quot;%1&quot; did not start</source>
         <translation>Prozess &quot;%1&quot; wurde nicht gestartet</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="916"/>
+        <location filename="mainwindow.cc" line="914"/>
         <source>Process exited unsuccessfully with code %1</source>
         <translation>Prozess endete mit code %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1058"/>
+        <location filename="mainwindow.cc" line="1056"/>
         <source>Translation successful</source>
         <translation>Konvertierung erfolgreich</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1068"/>
+        <location filename="mainwindow.cc" line="1066"/>
         <source>Error running gpsbabel: %1
 </source>
         <translation>Fehler beim Aufruf von gpsbabel: %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1188"/>
+        <location filename="mainwindow.cc" line="1186"/>
         <source>Are you sure you want to reset all format options to default values?</source>
         <translation>Sind Sie sicher, dass Sie alle Formatoptionen auf die Vorgaben stellen wollen?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1212"/>
+        <location filename="mainwindow.cc" line="1210"/>
         <source>About %1</source>
         <translation>Über %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1255"/>
+        <location filename="mainwindow.cc" line="1253"/>
         <source>One or more data filters are active</source>
         <translation>Einer oder mehrere Datenfilter sind aktiviert</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1257"/>
+        <location filename="mainwindow.cc" line="1255"/>
         <source>No data filters are active</source>
         <translation>Keine Datenfilter sind aktiv</translation>
     </message>
@@ -901,28 +901,28 @@ Das Prgramm muss abgebrochen werden.</translation>
     <name>MiscFltWidget</name>
     <message>
         <location filename="miscfltui.ui" line="97"/>
-        <location filename="filterwidgets.cc" line="224"/>
-        <location filename="filterwidgets.cc" line="225"/>
-        <location filename="filterwidgets.cc" line="228"/>
-        <location filename="filterwidgets.cc" line="229"/>
+        <location filename="filterwidgets.cc" line="226"/>
+        <location filename="filterwidgets.cc" line="227"/>
+        <location filename="filterwidgets.cc" line="230"/>
+        <location filename="filterwidgets.cc" line="231"/>
         <source>Tracks</source>
         <translation>Tracks</translation>
     </message>
     <message>
         <location filename="miscfltui.ui" line="104"/>
-        <location filename="filterwidgets.cc" line="224"/>
         <location filename="filterwidgets.cc" line="226"/>
-        <location filename="filterwidgets.cc" line="227"/>
+        <location filename="filterwidgets.cc" line="228"/>
         <location filename="filterwidgets.cc" line="229"/>
+        <location filename="filterwidgets.cc" line="231"/>
         <source>Waypoints</source>
         <translation>Wegpunkte</translation>
     </message>
     <message>
         <location filename="miscfltui.ui" line="90"/>
-        <location filename="filterwidgets.cc" line="225"/>
-        <location filename="filterwidgets.cc" line="226"/>
         <location filename="filterwidgets.cc" line="227"/>
         <location filename="filterwidgets.cc" line="228"/>
+        <location filename="filterwidgets.cc" line="229"/>
+        <location filename="filterwidgets.cc" line="230"/>
         <source>Routes</source>
         <translation>Routen</translation>
     </message>
@@ -1149,13 +1149,13 @@ Manche Dateiformate unterstuetzen nur eine Teilmenge, entweder Wegpunkte oder Tr
         <translation>Prozess beenden</translation>
     </message>
     <message>
-        <location filename="processwait.cc" line="156"/>
+        <location filename="processwait.cc" line="157"/>
         <source>Process did not terminate successfully</source>
         <translation>Prozess endete mit Fehler</translation>
     </message>
     <message>
-        <location filename="processwait.cc" line="175"/>
-        <source>Process crashed whle running</source>
+        <location filename="processwait.cc" line="176"/>
+        <source>Process crashed while running</source>
         <translation>Prozess-Crash bei Ausfuehrung</translation>
     </message>
 </context>
@@ -1255,7 +1255,7 @@ Die Qualität der Ergebnisse hängt von der Länge der Route ab und davon, wie d
     </message>
     <message>
         <location filename="rttrkui.ui" line="121"/>
-        <source>The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a wierd thing and place each waypoint on a separate day. 
+        <source>The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a weird thing and place each waypoint on a separate day. 
 Additionally, if you&apos;re using this to reverse a route that navigates, say, an exit ramp or a one way street, you will be in for unpleasant ride. application cares about timestamps </source>
         <translatorcomment>punctuation checked twice</translatorcomment>
         <translation>Die Umkehrung wird auf die einfachst-mögliche Art durchgeführt. Zeitangaben bleiben mit dem Original-Wegpunkt verbunden. Dadurch ergibt sich das interessante Detail, dass die Zeit in der resultierenden Route bzw. dem Track rückwärts läuft. Das führt dazu, daß insbesondere Magellan Mapsend wilde Dinge anstellt, wie z.B. daß jeder Wegpunkt auf einen anderen Tag gesetzt wird.
@@ -1322,38 +1322,43 @@ Diese Option korrigiert die Uhrzeit aller Trackpunkte. Dies kann nützlich sein,
         <translation>Verschieben</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="83"/>
-        <location filename="trackui.ui" line="275"/>
+        <location filename="trackui.ui" line="93"/>
+        <source>weeks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="trackui.ui" line="117"/>
+        <location filename="trackui.ui" line="339"/>
         <source>days</source>
         <translation>Tage</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="97"/>
+        <location filename="trackui.ui" line="141"/>
         <source>hours</source>
         <translatorcomment>shortform variant seemed sensible</translatorcomment>
         <translation>Std.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="111"/>
-        <location filename="trackui.ui" line="265"/>
+        <location filename="trackui.ui" line="165"/>
+        <location filename="trackui.ui" line="329"/>
         <source>mins</source>
         <translatorcomment>shortform variant seemed sensible</translatorcomment>
         <translation>Min.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="125"/>
+        <location filename="trackui.ui" line="189"/>
         <source>secs</source>
         <translatorcomment>shortform variant seemed sensible</translatorcomment>
         <translation>Sek.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="140"/>
-        <location filename="trackui.ui" line="155"/>
+        <location filename="trackui.ui" line="204"/>
+        <location filename="trackui.ui" line="219"/>
         <source>Use track pts. after this time. </source>
         <translation>Nur Trackpunkte nach diesem Zeitpunkt behalten.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="143"/>
+        <location filename="trackui.ui" line="207"/>
         <source>Use only track points after this timestamp.
 
 This option is used along with the stop to discard trackpoints that were recorded outside of a specific period of time. This option specifies the beginning of the time period. </source>
@@ -1362,33 +1367,33 @@ This option is used along with the stop to discard trackpoints that were recorde
 Diese Option wird zusammen mit ihrem Gegenspieler verwendet, um Trackpunkte zu verwerfen, die sich ausserhalb eines bestimmten Zeitfensters befinden. Diese Option definiert den Anfang des Fensters.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="148"/>
+        <location filename="trackui.ui" line="212"/>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="162"/>
+        <location filename="trackui.ui" line="226"/>
         <source>If checked, time specified here is based on this computer&apos;s current time zone. </source>
         <translation>Wenn angekreuzt, richtet sich die angegebene Zeit nach der Zeitzone dieses Computers.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="165"/>
+        <location filename="trackui.ui" line="229"/>
         <source>If checked, the times specified here are based on the local computer&apos;s time zone.  Otherwise it is UTC.</source>
         <translation>Wenn angekreuzt, richtet sich die angegebene Zeit nach der Zeitzone dieses Computers. Wenn nicht, wird UTC angenommen.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="168"/>
+        <location filename="trackui.ui" line="232"/>
         <source>Local Time</source>
         <translation>Lokale Zeit</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="181"/>
-        <location filename="trackui.ui" line="196"/>
+        <location filename="trackui.ui" line="245"/>
+        <location filename="trackui.ui" line="260"/>
         <source>Use track pts before this time. </source>
         <translation>Nur Trackpunkte vor diesem Zeitpunkt behalten.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="184"/>
+        <location filename="trackui.ui" line="248"/>
         <source> Use only track points before this timestamp.
 
 This option is used in conjunction with the start option to discard all trackpoints outside of a given period of time. This option defines the end of the time period. </source>
@@ -1397,18 +1402,18 @@ This option is used in conjunction with the start option to discard all trackpoi
 Diese Option wird zusammen mit ihrem Gegenstück verwendet, um alle Trackpunkte auβerhalb eines Zeitfensters zu verwerfen. Diese Option definiert das Ende des Fensters.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="189"/>
+        <location filename="trackui.ui" line="253"/>
         <source>Stop</source>
         <translation>Stop</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="203"/>
+        <location filename="trackui.ui" line="267"/>
         <source>Pack all tracks into one. </source>
         <translatorcomment>no sentence</translatorcomment>
         <translation>Tracks zu einem Track verketten</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="206"/>
+        <location filename="trackui.ui" line="270"/>
         <source>Pack all tracks into one.
 
 This option causes all tracks to be appended to one another to form a single track. This option does not work if any two tracks overlap in time; in that case, consider using the merge option.
@@ -1421,18 +1426,18 @@ Diese Option sorgt dafür, daβ alle Tracks hintereinander zu einen gemeinsamen
 Diese Option eignet sich am besten dafuer, Tracks zu verbinden, die durch eine Fehlfunktion oder eine automatische &apos;über-Nacht-Auftrennung&apos; aufgeteilt wurden.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="213"/>
+        <location filename="trackui.ui" line="277"/>
         <source>Pack</source>
         <translatorcomment>guesswork, depends on context</translatorcomment>
         <translation>Verketten</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="220"/>
+        <location filename="trackui.ui" line="284"/>
         <source>Merge multiple tracks for the same way.</source>
         <translation>Tracks auf einem Weg mischen.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="223"/>
+        <location filename="trackui.ui" line="287"/>
         <source> Merge multiple tracks for the same way.
 
 This option puts all track points from all tracks into a single track and sorts them by time stamp. Points with identical time stamps will be dropped. </source>
@@ -1441,12 +1446,12 @@ This option puts all track points from all tracks into a single track and sorts
 Diese Option übernimmt alle Punkte aus allen Tracks in einen einzigen Track und sortiert sie nach der Zeit. Punkte mit den gleichen Zeitdaten werden entfernt.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="228"/>
+        <location filename="trackui.ui" line="292"/>
         <source>Merge</source>
         <translation>Mischen</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="235"/>
+        <location filename="trackui.ui" line="299"/>
         <source>Split by Date</source>
         <oldsource>Split tracks. </oldsource>
         <translation>nach Datum teilen</translation>
@@ -1470,43 +1475,43 @@ Mehrere Tracks, die sich ueber Tagesgrenzen verteilen, können so ebenfalls an D
         <translation type="obsolete">Aufspalten</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="254"/>
+        <location filename="trackui.ui" line="318"/>
         <source>If nonzero, the track will be split if the time between two points is greater than this parameter.   If zero, the track will be split by date. </source>
         <translation>Falls nicht Null, und wenn die Zeitdaten aufeinanderfolgender Trackpunkte gröβer sind als der angegebene Wert, wird der Track dort aufgesplittet. Bei Null wird der Track an den Datumsgrenzen aufgeteilt.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="270"/>
+        <location filename="trackui.ui" line="334"/>
         <source>hrs</source>
         <translatorcomment>abbr point</translatorcomment>
         <translation>Std.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="285"/>
+        <location filename="trackui.ui" line="349"/>
         <source>Split by Dist.</source>
         <translation>nach Entf. teilen</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="297"/>
+        <location filename="trackui.ui" line="361"/>
         <source>If nonzero, the input track will be split into several tracks if the distance between successive track points is greater than the distance given as a parameter. </source>
         <translation>Falls nicht Null, und wenn die Distanz aufeinanderfolgender Trackpunkte gröβer ist als der angegebene Wert, wird der Track dort aufgesplittet.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="308"/>
+        <location filename="trackui.ui" line="372"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="313"/>
+        <location filename="trackui.ui" line="377"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="318"/>
+        <location filename="trackui.ui" line="382"/>
         <source>km</source>
         <translation>km</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="323"/>
+        <location filename="trackui.ui" line="387"/>
         <source>mi</source>
         <translation>meilen</translation>
     </message>
@@ -1528,43 +1533,43 @@ Diese Option erzeugt GPS Fixwerte und setzt diese für alle Trackpunkte auf die
 Die Option wird eingesetzt, um ein Format, das keine Fixdaten enthält in eines zu konvertieren, das sie voraussetzt.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="341"/>
+        <location filename="trackui.ui" line="405"/>
         <source>GPS Fixes</source>
         <translation>GPS Fixdaten</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="349"/>
+        <location filename="trackui.ui" line="413"/>
         <source>none</source>
         <translation>keine</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="354"/>
+        <location filename="trackui.ui" line="418"/>
         <source>pps</source>
         <translation>PPS</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="359"/>
+        <location filename="trackui.ui" line="423"/>
         <source>dgps</source>
         <translation>DGPS</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="364"/>
+        <location filename="trackui.ui" line="428"/>
         <source>3d</source>
         <translation>3d</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="369"/>
+        <location filename="trackui.ui" line="433"/>
         <source>2d</source>
         <translation>2d</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="407"/>
+        <location filename="trackui.ui" line="471"/>
         <source>Synthesize course.</source>
         <translatorcomment>no sentence</translatorcomment>
         <translation>Kurswerte generieren</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="410"/>
+        <location filename="trackui.ui" line="474"/>
         <source>Synthesize course.
 
 This option computes (or recomputes) a value for the GPS heading at each trackpoint. This is most useful with trackpoints from formats that don&apos;t support heading information or for trackpoints synthesized by the interpolate filter. The heading at each trackpoint is simply the course from the previous trackpoint in the track. The first trackpoint in each track is arbitrarily assigned a heading of 0 degrees. </source>
@@ -1573,33 +1578,33 @@ This option computes (or recomputes) a value for the GPS heading at each trackpo
 Diese Option erzeugt oder errechnet einen Wert für den GPS-Kurs an jeden Trackpunkt. Das ist insbesondere dann nützlich, wenn ein Format konvertiert werden soll, das keine Kursdaten enthält - oder für Trackpunkte die vom Mittelwert-Filter generiert wurden. Der Kurs an einem Trackpunkt ist einfach die Richtung vom vorherigen Trackpunkt zum aktuellen. Dem ersten Trackpunkt in jedem Track wird automatisch ein Wert von null Grad zugewiesen.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="415"/>
+        <location filename="trackui.ui" line="479"/>
         <source>Course</source>
         <translation>Kurs</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="392"/>
+        <location filename="trackui.ui" line="456"/>
         <source>Synthesize speed. </source>
         <translatorcomment>no sentence</translatorcomment>
         <translation>Tempodaten generieren</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="242"/>
+        <location filename="trackui.ui" line="306"/>
         <source>Split by Time</source>
         <translation>nach Zeit teilen</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="395"/>
+        <location filename="trackui.ui" line="459"/>
         <source>Synthesize speed.
 
-This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don&apos;t support speed information or for trackoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of &quot;unknown.&quot; </source>
+This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don&apos;t support speed information or for trackpoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of &quot;unknown.&quot; </source>
         <translatorcomment>this time it _is_ a full sentence correct the original instead</translatorcomment>
         <translation>Tempodaten generieren
 
 Diese Option generiert für jeden Trackpunkt einen Geschwindigkeitswert. Sie wird eingesetzt, wenn ein Format konvertiert werden soll, das diese Daten nicht enthält - oder bei Trackpunkten, die vom Mittelwert-Filter generiert wurden. Das Tempo an jedem Trackpunkt ist die mittlere Geschwindigkeit vom vorherigen (Weg durch Zeit). Dem ersten Trackpunkt in allen Tracks wird der Wert &apos;unbekannt&apos; zugewiesen.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="400"/>
+        <location filename="trackui.ui" line="464"/>
         <source>Speed</source>
         <translation>Geschwindikgkeit</translation>
     </message>

diff --git a/gui/gpsbabelfe_es.qm b/gui/gpsbabelfe_es.qm
index 7d74bc4e6f249662c7df59eba9621502fec7bf4c..d0813da2ff309d66813d0b9a5ec9e5275a82b170 100644 (file)
Binary files a/gui/gpsbabelfe_es.qm and b/gui/gpsbabelfe_es.qm differ

diff --git a/gui/gpsbabelfe_es.ts b/gui/gpsbabelfe_es.ts
index ff207c7f5836a767425be77c976611979c9dbeb8..4d8f30d99b0aecf65e7276b32e80185a336fed81 100644 (file)
--- a/gui/gpsbabelfe_es.ts
+++ b/gui/gpsbabelfe_es.ts
@@ -212,7 +212,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="advui.ui" line="52"/>
         <source>Debugging diagnostics.  
-Higher number provides more deitaled diagnostics.</source>
+Higher number provides more detailed diagnostics.</source>
         <translation>Depurar errores. Cuanto mayor es el número, el diagnóstico es más detallado.</translation>
     </message>
     <message>
@@ -535,31 +535,31 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">Defecto</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="565"/>
+        <location filename="mainwindow.cc" line="563"/>
         <source>Select one or more input files</source>
         <translation>Seleccionar uno o más archivos de entrada</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="593"/>
+        <location filename="mainwindow.cc" line="591"/>
         <source>Output File Name</source>
         <translation>Nombre del fichero de salida</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="657"/>
+        <location filename="mainwindow.cc" line="655"/>
         <source>Error reading format configuration.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation>Se ha producido un error cuando se intentaba leer la configuración. Compruebe que el núcleo de &quot;gpsbabel&quot; está instalado correctamente y que se halla en la RUTA actual. Este programa no puede continuar.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="668"/>
+        <location filename="mainwindow.cc" line="666"/>
         <source>Some file/device formats were not found during initialization.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation>El formato de alfunos ficheros o dispositivos no se halló durante la inicialización. Compruebe que el núcleo de &quot;gpsbabel&quot; está instalado correctamente y que se halla en la RUTA actual. Este programa no puede continuar.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="689"/>
+        <location filename="mainwindow.cc" line="687"/>
         <source>Input and output formats do not support %1</source>
         <translation>Formatos de entrada y salida inadmisibles %1</translation>
     </message>
@@ -568,109 +568,109 @@ This program cannot continue.</source>
         <translation type="vanished">Formatos de entrada inadmisible %1; Formatos de salida inadmisible %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="692"/>
+        <location filename="mainwindow.cc" line="690"/>
         <source>Input does not support %1; output format supports %1</source>
         <translation type="unfinished">Formatos de entrada inadmisible %1; Formatos de salida inadmisible %1 {1;?}</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="695"/>
+        <location filename="mainwindow.cc" line="693"/>
         <source>Input format supports %1; output format does not support %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="698"/>
+        <location filename="mainwindow.cc" line="696"/>
         <source>Both input and output formats support %1</source>
         <translation>Formatos de entrada y salida admisibles (ambos) %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="719"/>
+        <location filename="mainwindow.cc" line="717"/>
         <source>waypoints</source>
         <translation>Puntos de interés</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="720"/>
+        <location filename="mainwindow.cc" line="718"/>
         <source>tracks</source>
         <translation>Registro de trazados</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="721"/>
+        <location filename="mainwindow.cc" line="719"/>
         <source>routes</source>
         <translation>Rutas</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="816"/>
+        <location filename="mainwindow.cc" line="814"/>
         <source>There are no input options for format &quot;%1&quot;</source>
         <translation>No hay opciones de entrada para el formato &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="822"/>
-        <location filename="mainwindow.cc" line="841"/>
+        <location filename="mainwindow.cc" line="820"/>
+        <location filename="mainwindow.cc" line="839"/>
         <source>Options for %1</source>
         <translation>Opciones de %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="835"/>
+        <location filename="mainwindow.cc" line="833"/>
         <source>There are no output options for format &quot;%1&quot;</source>
         <translation>No hay opciones de salida para el formato &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="855"/>
+        <location filename="mainwindow.cc" line="853"/>
         <source>No valid waypoints/routes/tracks translation specified</source>
         <translation>Se han especificicado puntos de interés, trazados o rutas no traducibles</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="874"/>
+        <location filename="mainwindow.cc" line="872"/>
         <source>No input file specified</source>
         <translation>No se ha especificado el fichero de entrada</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="881"/>
+        <location filename="mainwindow.cc" line="879"/>
         <source>No valid output specified</source>
         <translation>El fichero de salida no es válido</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="886"/>
+        <location filename="mainwindow.cc" line="884"/>
         <source>No output file specified</source>
         <translation>No se ha especificado el fichero de salida</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="902"/>
+        <location filename="mainwindow.cc" line="900"/>
         <source>Process &quot;%1&quot; did not start</source>
         <translation>El proceso &quot;%1&quot; no comenzó</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="916"/>
+        <location filename="mainwindow.cc" line="914"/>
         <source>Process exited unsuccessfully with code %1</source>
         <translation>El proceso terminó sin suerte y con el código %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1058"/>
+        <location filename="mainwindow.cc" line="1056"/>
         <source>Translation successful</source>
         <translation>Traducción realizada con éxito</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1068"/>
+        <location filename="mainwindow.cc" line="1066"/>
         <source>Error running gpsbabel: %1
 </source>
         <translation>Error ejecutando gpsbabel: %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1188"/>
+        <location filename="mainwindow.cc" line="1186"/>
         <source>Are you sure you want to reset all format options to default values?</source>
         <translation>¿Estás seguro de que quieres volver a los formatos por defecto?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1212"/>
+        <location filename="mainwindow.cc" line="1210"/>
         <source>About %1</source>
         <translation>Acerca de %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1255"/>
+        <location filename="mainwindow.cc" line="1253"/>
         <source>One or more data filters are active</source>
         <translation>Uno o más filtros de datos están activos</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1257"/>
+        <location filename="mainwindow.cc" line="1255"/>
         <source>No data filters are active</source>
         <translation>Ningún filtro de datos está activo</translation>
     </message>
@@ -928,28 +928,28 @@ This program cannot continue.</source>
     <name>MiscFltWidget</name>
     <message>
         <location filename="miscfltui.ui" line="97"/>
-        <location filename="filterwidgets.cc" line="224"/>
-        <location filename="filterwidgets.cc" line="225"/>
-        <location filename="filterwidgets.cc" line="228"/>
-        <location filename="filterwidgets.cc" line="229"/>
+        <location filename="filterwidgets.cc" line="226"/>
+        <location filename="filterwidgets.cc" line="227"/>
+        <location filename="filterwidgets.cc" line="230"/>
+        <location filename="filterwidgets.cc" line="231"/>
         <source>Tracks</source>
         <translation>Trazados</translation>
     </message>
     <message>
         <location filename="miscfltui.ui" line="104"/>
-        <location filename="filterwidgets.cc" line="224"/>
         <location filename="filterwidgets.cc" line="226"/>
-        <location filename="filterwidgets.cc" line="227"/>
+        <location filename="filterwidgets.cc" line="228"/>
         <location filename="filterwidgets.cc" line="229"/>
+        <location filename="filterwidgets.cc" line="231"/>
         <source>Waypoints</source>
         <translation>Puntos de interés</translation>
     </message>
     <message>
         <location filename="miscfltui.ui" line="90"/>
-        <location filename="filterwidgets.cc" line="225"/>
-        <location filename="filterwidgets.cc" line="226"/>
         <location filename="filterwidgets.cc" line="227"/>
         <location filename="filterwidgets.cc" line="228"/>
+        <location filename="filterwidgets.cc" line="229"/>
+        <location filename="filterwidgets.cc" line="230"/>
         <source>Routes</source>
         <translation>Rutas</translation>
     </message>
@@ -1171,13 +1171,13 @@ Algunos formatos de datos de los GPS solo permiten utilizar una parte de los pun
         <translation>Parar el proceso</translation>
     </message>
     <message>
-        <location filename="processwait.cc" line="156"/>
+        <location filename="processwait.cc" line="157"/>
         <source>Process did not terminate successfully</source>
         <translation>El proceso no terminó como se esperaba</translation>
     </message>
     <message>
-        <location filename="processwait.cc" line="175"/>
-        <source>Process crashed whle running</source>
+        <location filename="processwait.cc" line="176"/>
+        <source>Process crashed while running</source>
         <translation>El proceso falló cuando estaba ejecutándose</translation>
     </message>
 </context>
@@ -1275,7 +1275,7 @@ La calidad de los resultados variará dependiendo del número de puntos que cont
     </message>
     <message>
         <location filename="rttrkui.ui" line="121"/>
-        <source>The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a wierd thing and place each waypoint on a separate day. 
+        <source>The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a weird thing and place each waypoint on a separate day. 
 Additionally, if you&apos;re using this to reverse a route that navigates, say, an exit ramp or a one way street, you will be in for unpleasant ride. application cares about timestamps </source>
         <translation>La inversión es realizada de la manera más simple posible. Los tiempos de marca de los puntos originales se guardan tal cual de tal forma que el trazado o la ruta resultantes tendrá características curiosas cuando el tiempo va para atrás. Esto hace que, sobre todo, Magellan Mapasend haga cosas raras como poner cada punto de interés en un día diferente. 
 Además, si se utiliza este filtro para navegar por una ruta invertida que se mueve, por ejemplo una rampa de salida o una calle de sentido único, puedes encontrarte con un viaje poco apacible. Al programa le importan los tiempos de marca </translation>
@@ -1338,35 +1338,40 @@ This option changes the time of all trackpoints. This might be useful if your tr
         <translation>Mover</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="83"/>
-        <location filename="trackui.ui" line="275"/>
+        <location filename="trackui.ui" line="93"/>
+        <source>weeks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="trackui.ui" line="117"/>
+        <location filename="trackui.ui" line="339"/>
         <source>days</source>
         <translation>días</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="97"/>
+        <location filename="trackui.ui" line="141"/>
         <source>hours</source>
         <translation>horas</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="111"/>
-        <location filename="trackui.ui" line="265"/>
+        <location filename="trackui.ui" line="165"/>
+        <location filename="trackui.ui" line="329"/>
         <source>mins</source>
         <translation>minutos</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="125"/>
+        <location filename="trackui.ui" line="189"/>
         <source>secs</source>
         <translation>segundos</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="140"/>
-        <location filename="trackui.ui" line="155"/>
+        <location filename="trackui.ui" line="204"/>
+        <location filename="trackui.ui" line="219"/>
         <source>Use track pts. after this time. </source>
         <translation>Usar sólo los puntos del trazado grabados después de esta hora.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="143"/>
+        <location filename="trackui.ui" line="207"/>
         <source>Use only track points after this timestamp.
 
 This option is used along with the stop to discard trackpoints that were recorded outside of a specific period of time. This option specifies the beginning of the time period. </source>
@@ -1375,50 +1380,50 @@ This option is used along with the stop to discard trackpoints that were recorde
 Esta opción se utiliza junto con la de parar (stop) para descartar puntos que fueron grabados fuera del período de tiempo deseado. La opción especifica el inicio del período. </translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="148"/>
+        <location filename="trackui.ui" line="212"/>
         <source>Start</source>
         <translation>Comenzar</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="162"/>
+        <location filename="trackui.ui" line="226"/>
         <source>If checked, time specified here is based on this computer&apos;s current time zone. </source>
         <translation>Si seleccionado, los datos especificados se basan en la zona horaria de tu ordenador. </translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="165"/>
+        <location filename="trackui.ui" line="229"/>
         <source>If checked, the times specified here are based on the local computer&apos;s time zone.  Otherwise it is UTC.</source>
         <translation>Si seleccionado, los datos especificados se basan en la zona horaria de tu ordenador. En caso contrario, es UTC.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="168"/>
+        <location filename="trackui.ui" line="232"/>
         <source>Local Time</source>
         <translation>Hora local</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="181"/>
-        <location filename="trackui.ui" line="196"/>
+        <location filename="trackui.ui" line="245"/>
+        <location filename="trackui.ui" line="260"/>
         <source>Use track pts before this time. </source>
         <translation>Usa los puntos del trazado tomados antes de esta hora. </translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="184"/>
+        <location filename="trackui.ui" line="248"/>
         <source> Use only track points before this timestamp.
 
 This option is used in conjunction with the start option to discard all trackpoints outside of a given period of time. This option defines the end of the time period. </source>
         <translation>Usa los puntos del trazado tomados antes de esta marca de tiempo. Esta opción se usa junto con la opción comenzar para descartar todos los puntos no tomados en determinado período temporal. Esta opción define el final del período. </translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="189"/>
+        <location filename="trackui.ui" line="253"/>
         <source>Stop</source>
         <translation>Parar</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="203"/>
+        <location filename="trackui.ui" line="267"/>
         <source>Pack all tracks into one. </source>
         <translation>Junta todos los trazados en uno. </translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="206"/>
+        <location filename="trackui.ui" line="270"/>
         <source>Pack all tracks into one.
 
 This option causes all tracks to be appended to one another to form a single track. This option does not work if any two tracks overlap in time; in that case, consider using the merge option.
@@ -1431,17 +1436,17 @@ Esta opción hace que todos los trazados se añadan uno tras otros hasta formar
 Esta opción es muy útil para juntar trazados que se interrumpieron por un error en el equipo o por una parada para descansar. </translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="213"/>
+        <location filename="trackui.ui" line="277"/>
         <source>Pack</source>
         <translation>Juntar</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="220"/>
+        <location filename="trackui.ui" line="284"/>
         <source>Merge multiple tracks for the same way.</source>
         <translation>Unir diversos trazados repetitivos.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="223"/>
+        <location filename="trackui.ui" line="287"/>
         <source> Merge multiple tracks for the same way.
 
 This option puts all track points from all tracks into a single track and sorts them by time stamp. Points with identical time stamps will be dropped. </source>
@@ -1450,12 +1455,12 @@ This option puts all track points from all tracks into a single track and sorts
 Esta opción pone todos los puntos de todos los trazados en un único trazado y los ordena por la marca de tiempo. Los puntos con idénticas marcas de tiempo son borrados.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="228"/>
+        <location filename="trackui.ui" line="292"/>
         <source>Merge</source>
         <translation>Unir</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="235"/>
+        <location filename="trackui.ui" line="299"/>
         <source>Split by Date</source>
         <oldsource>Split tracks. </oldsource>
         <translation>Dividir trazados por fecha</translation>
@@ -1478,42 +1483,42 @@ Si la entrada tiene múltiples trazados, júntalos antes de dividirlos por día.
         <translation type="obsolete">Dividir</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="254"/>
+        <location filename="trackui.ui" line="318"/>
         <source>If nonzero, the track will be split if the time between two points is greater than this parameter.   If zero, the track will be split by date. </source>
         <translation>Si &quot;nonzero&quot;, el trazado será dividido si el tiempo entre dos puntos es mayor que el parámetro.   Si &quot;zero&quot;, el trazado será dividido por día.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="270"/>
+        <location filename="trackui.ui" line="334"/>
         <source>hrs</source>
         <translation>hrs</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="285"/>
+        <location filename="trackui.ui" line="349"/>
         <source>Split by Dist.</source>
         <translation>Dividir trazados por distancia.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="297"/>
+        <location filename="trackui.ui" line="361"/>
         <source>If nonzero, the input track will be split into several tracks if the distance between successive track points is greater than the distance given as a parameter. </source>
         <translation>Si &quot;nonzero&quot;, el trazado será dividido en varios trazados si la distancia entre dos puntos es mayor que el parámetro dado.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="308"/>
+        <location filename="trackui.ui" line="372"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="313"/>
+        <location filename="trackui.ui" line="377"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="318"/>
+        <location filename="trackui.ui" line="382"/>
         <source>km</source>
         <translation>Km</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="323"/>
+        <location filename="trackui.ui" line="387"/>
         <source>mi</source>
         <translation>mi</translation>
     </message>
@@ -1535,42 +1540,42 @@ Esta opción fija el estatus de las correcciones GPS de todos los puntos del tra
 Esta opción es muy útil cuando se trata de convertir de un formato que no contiene ninguna corrección GPS a uno que la requiere.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="341"/>
+        <location filename="trackui.ui" line="405"/>
         <source>GPS Fixes</source>
         <translation>Correcciones GPS</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="349"/>
+        <location filename="trackui.ui" line="413"/>
         <source>none</source>
         <translation>ninguno</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="354"/>
+        <location filename="trackui.ui" line="418"/>
         <source>pps</source>
         <translation>pps</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="359"/>
+        <location filename="trackui.ui" line="423"/>
         <source>dgps</source>
         <translation>dgps</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="364"/>
+        <location filename="trackui.ui" line="428"/>
         <source>3d</source>
         <translation>3d</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="369"/>
+        <location filename="trackui.ui" line="433"/>
         <source>2d</source>
         <translation>2d</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="407"/>
+        <location filename="trackui.ui" line="471"/>
         <source>Synthesize course.</source>
         <translation>Sintetizar el rumbo.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="410"/>
+        <location filename="trackui.ui" line="474"/>
         <source>Synthesize course.
 
 This option computes (or recomputes) a value for the GPS heading at each trackpoint. This is most useful with trackpoints from formats that don&apos;t support heading information or for trackpoints synthesized by the interpolate filter. The heading at each trackpoint is simply the course from the previous trackpoint in the track. The first trackpoint in each track is arbitrarily assigned a heading of 0 degrees. </source>
@@ -1579,31 +1584,31 @@ This option computes (or recomputes) a value for the GPS heading at each trackpo
 Esta opción calcula (o recalcula) un valor para el rumbo de cada punto del trazado. Es muy útil para puntos de trazado en formatos que no contienen información sobre el rumbo o para puntos de trazado calculados con el filtro interpolar. El rumbo de cada punto es simplemente la dirección desde el punto previo en el trazado. El primer punto de cada trazado tiene el valor arbitrario de 0 grados.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="415"/>
+        <location filename="trackui.ui" line="479"/>
         <source>Course</source>
         <translation>Dirección</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="392"/>
+        <location filename="trackui.ui" line="456"/>
         <source>Synthesize speed. </source>
         <translation>Calcular velocidad. </translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="242"/>
+        <location filename="trackui.ui" line="306"/>
         <source>Split by Time</source>
         <translation>Dividir trazados en función del tiempo</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="395"/>
+        <location filename="trackui.ui" line="459"/>
         <source>Synthesize speed.
 
-This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don&apos;t support speed information or for trackoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of &quot;unknown.&quot; </source>
+This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don&apos;t support speed information or for trackpoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of &quot;unknown.&quot; </source>
         <translation>Sintetizar la veloclidad.
 
 Esta opción calcula (o recalcula) un valor para la velocidad de cada punto del trazado. Es muy útil para puntos de trazado en formatos que no contienen información sobre la velocidad o para puntos de trazado calculados con el filtro interpolar. La velocidad de cada punto es simplemente la media (distancia partido por tiempo) desde el punto previo en el trazado. El primer punto de cada trazado tiene el valor arbitrario de &quot;desconocido&quot;.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="400"/>
+        <location filename="trackui.ui" line="464"/>
         <source>Speed</source>
         <translation>Velocidad</translation>
     </message>

diff --git a/gui/gpsbabelfe_fr.ts b/gui/gpsbabelfe_fr.ts
index 13a266c808a2d1c37350595eb28bf0857b42fe2d..748064fa364433b6e70edfdbdb6792565d529d00 100644 (file)
--- a/gui/gpsbabelfe_fr.ts
+++ b/gui/gpsbabelfe_fr.ts
@@ -153,7 +153,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="advui.ui" line="52"/>
         <source>Debugging diagnostics.  
-Higher number provides more deitaled diagnostics.</source>
+Higher number provides more detailed diagnostics.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -470,138 +470,138 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.cc" line="565"/>
+        <location filename="mainwindow.cc" line="563"/>
         <source>Select one or more input files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="593"/>
+        <location filename="mainwindow.cc" line="591"/>
         <source>Output File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="657"/>
+        <location filename="mainwindow.cc" line="655"/>
         <source>Error reading format configuration.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="668"/>
+        <location filename="mainwindow.cc" line="666"/>
         <source>Some file/device formats were not found during initialization.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="689"/>
+        <location filename="mainwindow.cc" line="687"/>
         <source>Input and output formats do not support %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="692"/>
+        <location filename="mainwindow.cc" line="690"/>
         <source>Input does not support %1; output format supports %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="695"/>
+        <location filename="mainwindow.cc" line="693"/>
         <source>Input format supports %1; output format does not support %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="698"/>
+        <location filename="mainwindow.cc" line="696"/>
         <source>Both input and output formats support %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="719"/>
+        <location filename="mainwindow.cc" line="717"/>
         <source>waypoints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="720"/>
+        <location filename="mainwindow.cc" line="718"/>
         <source>tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="721"/>
+        <location filename="mainwindow.cc" line="719"/>
         <source>routes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="816"/>
+        <location filename="mainwindow.cc" line="814"/>
         <source>There are no input options for format &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="822"/>
-        <location filename="mainwindow.cc" line="841"/>
+        <location filename="mainwindow.cc" line="820"/>
+        <location filename="mainwindow.cc" line="839"/>
         <source>Options for %1</source>
         <translation>Options pour %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="835"/>
+        <location filename="mainwindow.cc" line="833"/>
         <source>There are no output options for format &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="855"/>
+        <location filename="mainwindow.cc" line="853"/>
         <source>No valid waypoints/routes/tracks translation specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="874"/>
+        <location filename="mainwindow.cc" line="872"/>
         <source>No input file specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="881"/>
+        <location filename="mainwindow.cc" line="879"/>
         <source>No valid output specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="886"/>
+        <location filename="mainwindow.cc" line="884"/>
         <source>No output file specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="902"/>
+        <location filename="mainwindow.cc" line="900"/>
         <source>Process &quot;%1&quot; did not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="916"/>
+        <location filename="mainwindow.cc" line="914"/>
         <source>Process exited unsuccessfully with code %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1058"/>
+        <location filename="mainwindow.cc" line="1056"/>
         <source>Translation successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1068"/>
+        <location filename="mainwindow.cc" line="1066"/>
         <source>Error running gpsbabel: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1188"/>
+        <location filename="mainwindow.cc" line="1186"/>
         <source>Are you sure you want to reset all format options to default values?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1212"/>
+        <location filename="mainwindow.cc" line="1210"/>
         <source>About %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1255"/>
+        <location filename="mainwindow.cc" line="1253"/>
         <source>One or more data filters are active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1257"/>
+        <location filename="mainwindow.cc" line="1255"/>
         <source>No data filters are active</source>
         <translation type="unfinished"></translation>
     </message>
@@ -851,28 +851,28 @@ This program cannot continue.</source>
     <name>MiscFltWidget</name>
     <message>
         <location filename="miscfltui.ui" line="97"/>
-        <location filename="filterwidgets.cc" line="224"/>
-        <location filename="filterwidgets.cc" line="225"/>
-        <location filename="filterwidgets.cc" line="228"/>
-        <location filename="filterwidgets.cc" line="229"/>
+        <location filename="filterwidgets.cc" line="226"/>
+        <location filename="filterwidgets.cc" line="227"/>
+        <location filename="filterwidgets.cc" line="230"/>
+        <location filename="filterwidgets.cc" line="231"/>
         <source>Tracks</source>
         <translation type="unfinished">Traces</translation>
     </message>
     <message>
         <location filename="miscfltui.ui" line="104"/>
-        <location filename="filterwidgets.cc" line="224"/>
         <location filename="filterwidgets.cc" line="226"/>
-        <location filename="filterwidgets.cc" line="227"/>
+        <location filename="filterwidgets.cc" line="228"/>
         <location filename="filterwidgets.cc" line="229"/>
+        <location filename="filterwidgets.cc" line="231"/>
         <source>Waypoints</source>
         <translation type="unfinished">Waypoints</translation>
     </message>
     <message>
         <location filename="miscfltui.ui" line="90"/>
-        <location filename="filterwidgets.cc" line="225"/>
-        <location filename="filterwidgets.cc" line="226"/>
         <location filename="filterwidgets.cc" line="227"/>
         <location filename="filterwidgets.cc" line="228"/>
+        <location filename="filterwidgets.cc" line="229"/>
+        <location filename="filterwidgets.cc" line="230"/>
         <source>Routes</source>
         <translation type="unfinished">Routes</translation>
     </message>
@@ -1091,13 +1091,13 @@ Some GPS data formats support only some subset of waypoints, tracks, and routes.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="processwait.cc" line="156"/>
+        <location filename="processwait.cc" line="157"/>
         <source>Process did not terminate successfully</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="processwait.cc" line="175"/>
-        <source>Process crashed whle running</source>
+        <location filename="processwait.cc" line="176"/>
+        <source>Process crashed while running</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1184,7 +1184,7 @@ The quality of the results will vary depending on the density of points in the o
     </message>
     <message>
         <location filename="rttrkui.ui" line="121"/>
-        <source>The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a wierd thing and place each waypoint on a separate day. 
+        <source>The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a weird thing and place each waypoint on a separate day. 
 Additionally, if you&apos;re using this to reverse a route that navigates, say, an exit ramp or a one way street, you will be in for unpleasant ride. application cares about timestamps </source>
         <translation type="unfinished"></translation>
     </message>
@@ -1245,85 +1245,90 @@ This option changes the time of all trackpoints. This might be useful if your tr
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="83"/>
-        <location filename="trackui.ui" line="275"/>
+        <location filename="trackui.ui" line="93"/>
+        <source>weeks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="trackui.ui" line="117"/>
+        <location filename="trackui.ui" line="339"/>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="97"/>
+        <location filename="trackui.ui" line="141"/>
         <source>hours</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="111"/>
-        <location filename="trackui.ui" line="265"/>
+        <location filename="trackui.ui" line="165"/>
+        <location filename="trackui.ui" line="329"/>
         <source>mins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="125"/>
+        <location filename="trackui.ui" line="189"/>
         <source>secs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="140"/>
-        <location filename="trackui.ui" line="155"/>
+        <location filename="trackui.ui" line="204"/>
+        <location filename="trackui.ui" line="219"/>
         <source>Use track pts. after this time. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="143"/>
+        <location filename="trackui.ui" line="207"/>
         <source>Use only track points after this timestamp.
 
 This option is used along with the stop to discard trackpoints that were recorded outside of a specific period of time. This option specifies the beginning of the time period. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="148"/>
+        <location filename="trackui.ui" line="212"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="162"/>
+        <location filename="trackui.ui" line="226"/>
         <source>If checked, time specified here is based on this computer&apos;s current time zone. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="165"/>
+        <location filename="trackui.ui" line="229"/>
         <source>If checked, the times specified here are based on the local computer&apos;s time zone.  Otherwise it is UTC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="168"/>
+        <location filename="trackui.ui" line="232"/>
         <source>Local Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="181"/>
-        <location filename="trackui.ui" line="196"/>
+        <location filename="trackui.ui" line="245"/>
+        <location filename="trackui.ui" line="260"/>
         <source>Use track pts before this time. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="184"/>
+        <location filename="trackui.ui" line="248"/>
         <source> Use only track points before this timestamp.
 
 This option is used in conjunction with the start option to discard all trackpoints outside of a given period of time. This option defines the end of the time period. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="189"/>
+        <location filename="trackui.ui" line="253"/>
         <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="203"/>
+        <location filename="trackui.ui" line="267"/>
         <source>Pack all tracks into one. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="206"/>
+        <location filename="trackui.ui" line="270"/>
         <source>Pack all tracks into one.
 
 This option causes all tracks to be appended to one another to form a single track. This option does not work if any two tracks overlap in time; in that case, consider using the merge option.
@@ -1332,139 +1337,139 @@ This option is most useful for rejoining tracks that might have been interrupted
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="213"/>
+        <location filename="trackui.ui" line="277"/>
         <source>Pack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="220"/>
+        <location filename="trackui.ui" line="284"/>
         <source>Merge multiple tracks for the same way.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="223"/>
+        <location filename="trackui.ui" line="287"/>
         <source> Merge multiple tracks for the same way.
 
 This option puts all track points from all tracks into a single track and sorts them by time stamp. Points with identical time stamps will be dropped. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="228"/>
+        <location filename="trackui.ui" line="292"/>
         <source>Merge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="235"/>
+        <location filename="trackui.ui" line="299"/>
         <source>Split by Date</source>
         <oldsource>Split tracks. </oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="254"/>
+        <location filename="trackui.ui" line="318"/>
         <source>If nonzero, the track will be split if the time between two points is greater than this parameter.   If zero, the track will be split by date. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="270"/>
+        <location filename="trackui.ui" line="334"/>
         <source>hrs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="285"/>
+        <location filename="trackui.ui" line="349"/>
         <source>Split by Dist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="297"/>
+        <location filename="trackui.ui" line="361"/>
         <source>If nonzero, the input track will be split into several tracks if the distance between successive track points is greater than the distance given as a parameter. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="308"/>
+        <location filename="trackui.ui" line="372"/>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="313"/>
+        <location filename="trackui.ui" line="377"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="318"/>
+        <location filename="trackui.ui" line="382"/>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="323"/>
+        <location filename="trackui.ui" line="387"/>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="341"/>
+        <location filename="trackui.ui" line="405"/>
         <source>GPS Fixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="349"/>
+        <location filename="trackui.ui" line="413"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="354"/>
+        <location filename="trackui.ui" line="418"/>
         <source>pps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="359"/>
+        <location filename="trackui.ui" line="423"/>
         <source>dgps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="364"/>
+        <location filename="trackui.ui" line="428"/>
         <source>3d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="369"/>
+        <location filename="trackui.ui" line="433"/>
         <source>2d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="407"/>
+        <location filename="trackui.ui" line="471"/>
         <source>Synthesize course.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="410"/>
+        <location filename="trackui.ui" line="474"/>
         <source>Synthesize course.
 
 This option computes (or recomputes) a value for the GPS heading at each trackpoint. This is most useful with trackpoints from formats that don&apos;t support heading information or for trackpoints synthesized by the interpolate filter. The heading at each trackpoint is simply the course from the previous trackpoint in the track. The first trackpoint in each track is arbitrarily assigned a heading of 0 degrees. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="415"/>
+        <location filename="trackui.ui" line="479"/>
         <source>Course</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="392"/>
+        <location filename="trackui.ui" line="456"/>
         <source>Synthesize speed. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="242"/>
+        <location filename="trackui.ui" line="306"/>
         <source>Split by Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="395"/>
+        <location filename="trackui.ui" line="459"/>
         <source>Synthesize speed.
 
-This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don&apos;t support speed information or for trackoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of &quot;unknown.&quot; </source>
+This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don&apos;t support speed information or for trackpoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of &quot;unknown.&quot; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="400"/>
+        <location filename="trackui.ui" line="464"/>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/gui/gpsbabelfe_hu.ts b/gui/gpsbabelfe_hu.ts
index 2037ac3ef651e43acb821c958b7be8db755e4f67..10da52e3384b22bd8a29e9ff8f8dfa5b125221fb 100644 (file)
--- a/gui/gpsbabelfe_hu.ts
+++ b/gui/gpsbabelfe_hu.ts
@@ -153,7 +153,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="advui.ui" line="52"/>
         <source>Debugging diagnostics.  
-Higher number provides more deitaled diagnostics.</source>
+Higher number provides more detailed diagnostics.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -470,138 +470,138 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.cc" line="565"/>
+        <location filename="mainwindow.cc" line="563"/>
         <source>Select one or more input files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="593"/>
+        <location filename="mainwindow.cc" line="591"/>
         <source>Output File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="657"/>
+        <location filename="mainwindow.cc" line="655"/>
         <source>Error reading format configuration.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="668"/>
+        <location filename="mainwindow.cc" line="666"/>
         <source>Some file/device formats were not found during initialization.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="689"/>
+        <location filename="mainwindow.cc" line="687"/>
         <source>Input and output formats do not support %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="692"/>
+        <location filename="mainwindow.cc" line="690"/>
         <source>Input does not support %1; output format supports %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="695"/>
+        <location filename="mainwindow.cc" line="693"/>
         <source>Input format supports %1; output format does not support %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="698"/>
+        <location filename="mainwindow.cc" line="696"/>
         <source>Both input and output formats support %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="719"/>
+        <location filename="mainwindow.cc" line="717"/>
         <source>waypoints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="720"/>
+        <location filename="mainwindow.cc" line="718"/>
         <source>tracks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="721"/>
+        <location filename="mainwindow.cc" line="719"/>
         <source>routes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="816"/>
+        <location filename="mainwindow.cc" line="814"/>
         <source>There are no input options for format &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="822"/>
-        <location filename="mainwindow.cc" line="841"/>
+        <location filename="mainwindow.cc" line="820"/>
+        <location filename="mainwindow.cc" line="839"/>
         <source>Options for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="835"/>
+        <location filename="mainwindow.cc" line="833"/>
         <source>There are no output options for format &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="855"/>
+        <location filename="mainwindow.cc" line="853"/>
         <source>No valid waypoints/routes/tracks translation specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="874"/>
+        <location filename="mainwindow.cc" line="872"/>
         <source>No input file specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="881"/>
+        <location filename="mainwindow.cc" line="879"/>
         <source>No valid output specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="886"/>
+        <location filename="mainwindow.cc" line="884"/>
         <source>No output file specified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="902"/>
+        <location filename="mainwindow.cc" line="900"/>
         <source>Process &quot;%1&quot; did not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="916"/>
+        <location filename="mainwindow.cc" line="914"/>
         <source>Process exited unsuccessfully with code %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1058"/>
+        <location filename="mainwindow.cc" line="1056"/>
         <source>Translation successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1068"/>
+        <location filename="mainwindow.cc" line="1066"/>
         <source>Error running gpsbabel: %1
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1188"/>
+        <location filename="mainwindow.cc" line="1186"/>
         <source>Are you sure you want to reset all format options to default values?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1212"/>
+        <location filename="mainwindow.cc" line="1210"/>
         <source>About %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1255"/>
+        <location filename="mainwindow.cc" line="1253"/>
         <source>One or more data filters are active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1257"/>
+        <location filename="mainwindow.cc" line="1255"/>
         <source>No data filters are active</source>
         <translation type="unfinished"></translation>
     </message>
@@ -846,28 +846,28 @@ This program cannot continue.</source>
     <name>MiscFltWidget</name>
     <message>
         <location filename="miscfltui.ui" line="97"/>
-        <location filename="filterwidgets.cc" line="224"/>
-        <location filename="filterwidgets.cc" line="225"/>
-        <location filename="filterwidgets.cc" line="228"/>
-        <location filename="filterwidgets.cc" line="229"/>
+        <location filename="filterwidgets.cc" line="226"/>
+        <location filename="filterwidgets.cc" line="227"/>
+        <location filename="filterwidgets.cc" line="230"/>
+        <location filename="filterwidgets.cc" line="231"/>
         <source>Tracks</source>
         <translation type="unfinished">Nyomvonalak</translation>
     </message>
     <message>
         <location filename="miscfltui.ui" line="104"/>
-        <location filename="filterwidgets.cc" line="224"/>
         <location filename="filterwidgets.cc" line="226"/>
-        <location filename="filterwidgets.cc" line="227"/>
+        <location filename="filterwidgets.cc" line="228"/>
         <location filename="filterwidgets.cc" line="229"/>
+        <location filename="filterwidgets.cc" line="231"/>
         <source>Waypoints</source>
         <translation type="unfinished">Útpontok</translation>
     </message>
     <message>
         <location filename="miscfltui.ui" line="90"/>
-        <location filename="filterwidgets.cc" line="225"/>
-        <location filename="filterwidgets.cc" line="226"/>
         <location filename="filterwidgets.cc" line="227"/>
         <location filename="filterwidgets.cc" line="228"/>
+        <location filename="filterwidgets.cc" line="229"/>
+        <location filename="filterwidgets.cc" line="230"/>
         <source>Routes</source>
         <translation type="unfinished">Útvonalak</translation>
     </message>
@@ -1086,13 +1086,13 @@ Some GPS data formats support only some subset of waypoints, tracks, and routes.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="processwait.cc" line="156"/>
+        <location filename="processwait.cc" line="157"/>
         <source>Process did not terminate successfully</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="processwait.cc" line="175"/>
-        <source>Process crashed whle running</source>
+        <location filename="processwait.cc" line="176"/>
+        <source>Process crashed while running</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1179,7 +1179,7 @@ The quality of the results will vary depending on the density of points in the o
     </message>
     <message>
         <location filename="rttrkui.ui" line="121"/>
-        <source>The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a wierd thing and place each waypoint on a separate day. 
+        <source>The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a weird thing and place each waypoint on a separate day. 
 Additionally, if you&apos;re using this to reverse a route that navigates, say, an exit ramp or a one way street, you will be in for unpleasant ride. application cares about timestamps </source>
         <translation type="unfinished"></translation>
     </message>
@@ -1240,85 +1240,90 @@ This option changes the time of all trackpoints. This might be useful if your tr
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="83"/>
-        <location filename="trackui.ui" line="275"/>
+        <location filename="trackui.ui" line="93"/>
+        <source>weeks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="trackui.ui" line="117"/>
+        <location filename="trackui.ui" line="339"/>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="97"/>
+        <location filename="trackui.ui" line="141"/>
         <source>hours</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="111"/>
-        <location filename="trackui.ui" line="265"/>
+        <location filename="trackui.ui" line="165"/>
+        <location filename="trackui.ui" line="329"/>
         <source>mins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="125"/>
+        <location filename="trackui.ui" line="189"/>
         <source>secs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="140"/>
-        <location filename="trackui.ui" line="155"/>
+        <location filename="trackui.ui" line="204"/>
+        <location filename="trackui.ui" line="219"/>
         <source>Use track pts. after this time. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="143"/>
+        <location filename="trackui.ui" line="207"/>
         <source>Use only track points after this timestamp.
 
 This option is used along with the stop to discard trackpoints that were recorded outside of a specific period of time. This option specifies the beginning of the time period. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="148"/>
+        <location filename="trackui.ui" line="212"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="162"/>
+        <location filename="trackui.ui" line="226"/>
         <source>If checked, time specified here is based on this computer&apos;s current time zone. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="165"/>
+        <location filename="trackui.ui" line="229"/>
         <source>If checked, the times specified here are based on the local computer&apos;s time zone.  Otherwise it is UTC.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="168"/>
+        <location filename="trackui.ui" line="232"/>
         <source>Local Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="181"/>
-        <location filename="trackui.ui" line="196"/>
+        <location filename="trackui.ui" line="245"/>
+        <location filename="trackui.ui" line="260"/>
         <source>Use track pts before this time. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="184"/>
+        <location filename="trackui.ui" line="248"/>
         <source> Use only track points before this timestamp.
 
 This option is used in conjunction with the start option to discard all trackpoints outside of a given period of time. This option defines the end of the time period. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="189"/>
+        <location filename="trackui.ui" line="253"/>
         <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="203"/>
+        <location filename="trackui.ui" line="267"/>
         <source>Pack all tracks into one. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="206"/>
+        <location filename="trackui.ui" line="270"/>
         <source>Pack all tracks into one.
 
 This option causes all tracks to be appended to one another to form a single track. This option does not work if any two tracks overlap in time; in that case, consider using the merge option.
@@ -1327,139 +1332,139 @@ This option is most useful for rejoining tracks that might have been interrupted
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="213"/>
+        <location filename="trackui.ui" line="277"/>
         <source>Pack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="220"/>
+        <location filename="trackui.ui" line="284"/>
         <source>Merge multiple tracks for the same way.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="223"/>
+        <location filename="trackui.ui" line="287"/>
         <source> Merge multiple tracks for the same way.
 
 This option puts all track points from all tracks into a single track and sorts them by time stamp. Points with identical time stamps will be dropped. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="228"/>
+        <location filename="trackui.ui" line="292"/>
         <source>Merge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="235"/>
+        <location filename="trackui.ui" line="299"/>
         <source>Split by Date</source>
         <oldsource>Split tracks. </oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="254"/>
+        <location filename="trackui.ui" line="318"/>
         <source>If nonzero, the track will be split if the time between two points is greater than this parameter.   If zero, the track will be split by date. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="270"/>
+        <location filename="trackui.ui" line="334"/>
         <source>hrs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="285"/>
+        <location filename="trackui.ui" line="349"/>
         <source>Split by Dist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="297"/>
+        <location filename="trackui.ui" line="361"/>
         <source>If nonzero, the input track will be split into several tracks if the distance between successive track points is greater than the distance given as a parameter. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="308"/>
+        <location filename="trackui.ui" line="372"/>
         <source>ft</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="313"/>
+        <location filename="trackui.ui" line="377"/>
         <source>m</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="318"/>
+        <location filename="trackui.ui" line="382"/>
         <source>km</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="323"/>
+        <location filename="trackui.ui" line="387"/>
         <source>mi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="341"/>
+        <location filename="trackui.ui" line="405"/>
         <source>GPS Fixes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="349"/>
+        <location filename="trackui.ui" line="413"/>
         <source>none</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="354"/>
+        <location filename="trackui.ui" line="418"/>
         <source>pps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="359"/>
+        <location filename="trackui.ui" line="423"/>
         <source>dgps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="364"/>
+        <location filename="trackui.ui" line="428"/>
         <source>3d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="369"/>
+        <location filename="trackui.ui" line="433"/>
         <source>2d</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="407"/>
+        <location filename="trackui.ui" line="471"/>
         <source>Synthesize course.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="410"/>
+        <location filename="trackui.ui" line="474"/>
         <source>Synthesize course.
 
 This option computes (or recomputes) a value for the GPS heading at each trackpoint. This is most useful with trackpoints from formats that don&apos;t support heading information or for trackpoints synthesized by the interpolate filter. The heading at each trackpoint is simply the course from the previous trackpoint in the track. The first trackpoint in each track is arbitrarily assigned a heading of 0 degrees. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="415"/>
+        <location filename="trackui.ui" line="479"/>
         <source>Course</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="392"/>
+        <location filename="trackui.ui" line="456"/>
         <source>Synthesize speed. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="242"/>
+        <location filename="trackui.ui" line="306"/>
         <source>Split by Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="395"/>
+        <location filename="trackui.ui" line="459"/>
         <source>Synthesize speed.
 
-This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don&apos;t support speed information or for trackoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of &quot;unknown.&quot; </source>
+This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don&apos;t support speed information or for trackpoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of &quot;unknown.&quot; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="400"/>
+        <location filename="trackui.ui" line="464"/>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/gui/gpsbabelfe_it.qm b/gui/gpsbabelfe_it.qm
index ee5ac0614b533ae1dad08d0453a245fcde2025d9..0db2bafca9bfa50c7eb60117da43b43df3c424b0 100644 (file)
Binary files a/gui/gpsbabelfe_it.qm and b/gui/gpsbabelfe_it.qm differ

diff --git a/gui/gpsbabelfe_it.ts b/gui/gpsbabelfe_it.ts
index 45459a71890324e256ba4b087119acb2d46a186c..24ab118b92d6310cc80ca7143db172d39d40a634 100644 (file)
--- a/gui/gpsbabelfe_it.ts
+++ b/gui/gpsbabelfe_it.ts
@@ -108,7 +108,7 @@ Questo programma è software libero; è possibile distribuirlo e/o mod
     <message>
         <location filename="advui.ui" line="52"/>
         <source>Debugging diagnostics.  
-Higher number provides more deitaled diagnostics.</source>
+Higher number provides more detailed diagnostics.</source>
         <translation>Diagnosi di debug.  
 Un numero più alto fornisce un livello di diagnosi più dettagliato.</translation>
     </message>
@@ -688,17 +688,17 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">predefinite</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="565"/>
+        <location filename="mainwindow.cc" line="563"/>
         <source>Select one or more input files</source>
         <translation>Selezionare uno o più file in ingresso</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="593"/>
+        <location filename="mainwindow.cc" line="591"/>
         <source>Output File Name</source>
         <translation>Nome del file in uscita</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="657"/>
+        <location filename="mainwindow.cc" line="655"/>
         <source>Error reading format configuration.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
@@ -707,7 +707,7 @@ This program cannot continue.</source>
 Questo programma non può proseguire.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="668"/>
+        <location filename="mainwindow.cc" line="666"/>
         <source>Some file/device formats were not found during initialization.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
@@ -716,7 +716,7 @@ This program cannot continue.</source>
 Questo programma non può proseguire.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="689"/>
+        <location filename="mainwindow.cc" line="687"/>
         <source>Input and output formats do not support %1</source>
         <translation>I formati di ingresso e di uscita non supportano %1</translation>
     </message>
@@ -729,110 +729,110 @@ Questo programma non può proseguire.</translation>
         <translation type="vanished">Il formato in ingresso supporta %1, il formato di destinazione non supporta %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="692"/>
+        <location filename="mainwindow.cc" line="690"/>
         <source>Input does not support %1; output format supports %1</source>
         <translation type="unfinished">L&apos;ingresso non supporta %1, il formato di destinazione supporta %1 {1;?}</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="695"/>
+        <location filename="mainwindow.cc" line="693"/>
         <source>Input format supports %1; output format does not support %1</source>
         <translation type="unfinished">Il formato in ingresso supporta %1, il formato di destinazione non supporta %1 {1;?}</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="698"/>
+        <location filename="mainwindow.cc" line="696"/>
         <source>Both input and output formats support %1</source>
         <translation>I formati di origine e di destinazione supportano %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="719"/>
+        <location filename="mainwindow.cc" line="717"/>
         <source>waypoints</source>
         <translation>punti di interesse</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="720"/>
+        <location filename="mainwindow.cc" line="718"/>
         <source>tracks</source>
         <translation>tracce</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="721"/>
+        <location filename="mainwindow.cc" line="719"/>
         <source>routes</source>
         <translation>rotte</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="816"/>
+        <location filename="mainwindow.cc" line="814"/>
         <source>There are no input options for format &quot;%1&quot;</source>
         <translation>Non ci sono opzioni in ingresso per il formato &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="822"/>
-        <location filename="mainwindow.cc" line="841"/>
+        <location filename="mainwindow.cc" line="820"/>
+        <location filename="mainwindow.cc" line="839"/>
         <source>Options for %1</source>
         <translation>Opzioni per %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="835"/>
+        <location filename="mainwindow.cc" line="833"/>
         <source>There are no output options for format &quot;%1&quot;</source>
         <translation>Non ci sono opzioni in uscita per il formato &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="855"/>
+        <location filename="mainwindow.cc" line="853"/>
         <source>No valid waypoints/routes/tracks translation specified</source>
         <translation>Non è stato specificato alcun punto di interesse/rotta/traccia</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="874"/>
+        <location filename="mainwindow.cc" line="872"/>
         <source>No input file specified</source>
         <translation>Il file di origine non è stato specificato</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="881"/>
+        <location filename="mainwindow.cc" line="879"/>
         <source>No valid output specified</source>
         <translation>Non è stata specificata una destinazione valida</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="886"/>
+        <location filename="mainwindow.cc" line="884"/>
         <source>No output file specified</source>
         <translation>Il file di destinazione non è stato specificato</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="902"/>
+        <location filename="mainwindow.cc" line="900"/>
         <source>Process &quot;%1&quot; did not start</source>
         <translation>Il processo &quot;%1&quot; non è stato avviato</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="916"/>
+        <location filename="mainwindow.cc" line="914"/>
         <source>Process exited unsuccessfully with code %1</source>
         <translation>Il processo è terminato con il codice di errorre %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1058"/>
+        <location filename="mainwindow.cc" line="1056"/>
         <source>Translation successful</source>
         <translation>Traduzione terminata con successo</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1068"/>
+        <location filename="mainwindow.cc" line="1066"/>
         <source>Error running gpsbabel: %1
 </source>
         <translation>Errore durante l&apos;esecuzione di gpsbabel: %1
 </translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1188"/>
+        <location filename="mainwindow.cc" line="1186"/>
         <source>Are you sure you want to reset all format options to default values?</source>
         <translation>Si è certi di voler reimpostare tutte le opzioni dei formati ai valori predefiniti?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1212"/>
+        <location filename="mainwindow.cc" line="1210"/>
         <source>About %1</source>
         <translation>Informazioni su %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1255"/>
+        <location filename="mainwindow.cc" line="1253"/>
         <source>One or more data filters are active</source>
         <translation>È attivo uno o più filtri di dati</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1257"/>
+        <location filename="mainwindow.cc" line="1255"/>
         <source>No data filters are active</source>
         <translation>Nessun filtro di dati è attivo</translation>
     </message>
@@ -869,28 +869,28 @@ Questo programma non può proseguire.</translation>
     </message>
     <message>
         <location filename="miscfltui.ui" line="90"/>
-        <location filename="filterwidgets.cc" line="225"/>
-        <location filename="filterwidgets.cc" line="226"/>
         <location filename="filterwidgets.cc" line="227"/>
         <location filename="filterwidgets.cc" line="228"/>
+        <location filename="filterwidgets.cc" line="229"/>
+        <location filename="filterwidgets.cc" line="230"/>
         <source>Routes</source>
         <translation>Rotte</translation>
     </message>
     <message>
         <location filename="miscfltui.ui" line="97"/>
-        <location filename="filterwidgets.cc" line="224"/>
-        <location filename="filterwidgets.cc" line="225"/>
-        <location filename="filterwidgets.cc" line="228"/>
-        <location filename="filterwidgets.cc" line="229"/>
+        <location filename="filterwidgets.cc" line="226"/>
+        <location filename="filterwidgets.cc" line="227"/>
+        <location filename="filterwidgets.cc" line="230"/>
+        <location filename="filterwidgets.cc" line="231"/>
         <source>Tracks</source>
         <translation>Tracce</translation>
     </message>
     <message>
         <location filename="miscfltui.ui" line="104"/>
-        <location filename="filterwidgets.cc" line="224"/>
         <location filename="filterwidgets.cc" line="226"/>
-        <location filename="filterwidgets.cc" line="227"/>
+        <location filename="filterwidgets.cc" line="228"/>
         <location filename="filterwidgets.cc" line="229"/>
+        <location filename="filterwidgets.cc" line="231"/>
         <source>Waypoints</source>
         <translation>Punti di interesse</translation>
     </message>
@@ -1096,13 +1096,13 @@ Qualche formato di dati del GPS supporta solo un sottoinsieme di punti di intere
         <translation>Arresta il processo</translation>
     </message>
     <message>
-        <location filename="processwait.cc" line="156"/>
+        <location filename="processwait.cc" line="157"/>
         <source>Process did not terminate successfully</source>
         <translation>Il processo non è terminato correttamente</translation>
     </message>
     <message>
-        <location filename="processwait.cc" line="175"/>
-        <source>Process crashed whle running</source>
+        <location filename="processwait.cc" line="176"/>
+        <source>Process crashed while running</source>
         <translation>Il processo si è interrotto</translation>
     </message>
 </context>
@@ -1195,7 +1195,7 @@ La qualità dei risultati dipenderà dalla densità dei punti e dalla lunghezza
     </message>
     <message>
         <location filename="rttrkui.ui" line="121"/>
-        <source>The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a wierd thing and place each waypoint on a separate day. 
+        <source>The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a weird thing and place each waypoint on a separate day. 
 Additionally, if you&apos;re using this to reverse a route that navigates, say, an exit ramp or a one way street, you will be in for unpleasant ride. application cares about timestamps </source>
         <translation>L&apos;inversione è effettuata nel modo più pigro possibile. Date ed ore sono mantenute con i punti di interesse originali in modo che la traccia o rotta risultante avrà la caratteristica interessante che il tempo scorre all&apos;indietro. Questo comporta, in particolare, che Magellan MapSend si comporti in modo strano e inserisca ogni punti di interesse in un giorno diverso.
 Inoltre, se stai usando questa operazione per invertire una rotta che percorre, ad esempio, una rampa di uscita o una strada a senso unico, potrai incappare in un giro poco piacevoli. L&apos;applicazione si preoccupa di data e ora</translation>
@@ -1265,35 +1265,40 @@ Questa opzione modifica la data/l&apos;ora di tutti i punti traccia. Può essere
         <translation>Sposta</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="83"/>
-        <location filename="trackui.ui" line="275"/>
+        <location filename="trackui.ui" line="93"/>
+        <source>weeks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="trackui.ui" line="117"/>
+        <location filename="trackui.ui" line="339"/>
         <source>days</source>
         <translation>giorni</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="97"/>
+        <location filename="trackui.ui" line="141"/>
         <source>hours</source>
         <translation>ore</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="111"/>
-        <location filename="trackui.ui" line="265"/>
+        <location filename="trackui.ui" line="165"/>
+        <location filename="trackui.ui" line="329"/>
         <source>mins</source>
         <translation>minuti</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="125"/>
+        <location filename="trackui.ui" line="189"/>
         <source>secs</source>
         <translation>secondi</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="140"/>
-        <location filename="trackui.ui" line="155"/>
+        <location filename="trackui.ui" line="204"/>
+        <location filename="trackui.ui" line="219"/>
         <source>Use track pts. after this time. </source>
         <translation>Usa i punti traccia dopo quest&apos;ora. </translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="143"/>
+        <location filename="trackui.ui" line="207"/>
         <source>Use only track points after this timestamp.
 
 This option is used along with the stop to discard trackpoints that were recorded outside of a specific period of time. This option specifies the beginning of the time period. </source>
@@ -1302,33 +1307,33 @@ This option is used along with the stop to discard trackpoints that were recorde
 Questa opzione viene usata congiuntamente con lo stop per scartare i punti traccia che sono stati salvati al di fuori di uno specifico intervallo temporale. Questa opzione specifica l&apos;inizio dell&apos;intervallo temporale.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="148"/>
+        <location filename="trackui.ui" line="212"/>
         <source>Start</source>
         <translation>Inizio</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="162"/>
+        <location filename="trackui.ui" line="226"/>
         <source>If checked, time specified here is based on this computer&apos;s current time zone. </source>
         <translation>Se selezionato, l&apos;ora indicata qui è basata sul fuso orario impostato nel PC. </translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="165"/>
+        <location filename="trackui.ui" line="229"/>
         <source>If checked, the times specified here are based on the local computer&apos;s time zone.  Otherwise it is UTC.</source>
         <translation>Se selezionato, gli orari specificati qui sono basati sul fuso orario del computer.  Altrimenti saranno in UTC (fuso di Greenwich).</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="168"/>
+        <location filename="trackui.ui" line="232"/>
         <source>Local Time</source>
         <translation>Tempo locale</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="181"/>
-        <location filename="trackui.ui" line="196"/>
+        <location filename="trackui.ui" line="245"/>
+        <location filename="trackui.ui" line="260"/>
         <source>Use track pts before this time. </source>
         <translation>Usa i punti traccia prima di quest&apos;ora. </translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="184"/>
+        <location filename="trackui.ui" line="248"/>
         <source> Use only track points before this timestamp.
 
 This option is used in conjunction with the start option to discard all trackpoints outside of a given period of time. This option defines the end of the time period. </source>
@@ -1337,17 +1342,17 @@ This option is used in conjunction with the start option to discard all trackpoi
 Questa opzione viene usata congiuntamente con l&apos;inizio per scartare i punti traccia che sono stati salvati al di fuori di uno specifico intervallo temporale. Questa opzione specifica la fine dell&apos;intervallo temporale. </translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="189"/>
+        <location filename="trackui.ui" line="253"/>
         <source>Stop</source>
         <translation>Fine</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="203"/>
+        <location filename="trackui.ui" line="267"/>
         <source>Pack all tracks into one. </source>
         <translation>Concatena tutte le tracce in una. </translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="206"/>
+        <location filename="trackui.ui" line="270"/>
         <source>Pack all tracks into one.
 
 This option causes all tracks to be appended to one another to form a single track. This option does not work if any two tracks overlap in time; in that case, consider using the merge option.
@@ -1360,17 +1365,17 @@ Questa opzione fa in modo che tutte le tracce vengano unite per formarne una sol
 Questa opzione è utile soprattutto per unire tracce che si sono interrotte per un malfunzionamento del dispositivo o per un arresto notturno. </translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="213"/>
+        <location filename="trackui.ui" line="277"/>
         <source>Pack</source>
         <translation>Concatena</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="220"/>
+        <location filename="trackui.ui" line="284"/>
         <source>Merge multiple tracks for the same way.</source>
         <translation>Unisci più tracce per la stessa strada.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="223"/>
+        <location filename="trackui.ui" line="287"/>
         <source> Merge multiple tracks for the same way.
 
 This option puts all track points from all tracks into a single track and sorts them by time stamp. Points with identical time stamps will be dropped. </source>
@@ -1379,116 +1384,116 @@ This option puts all track points from all tracks into a single track and sorts
 Questa opzione inserisce tutti i punti di ogni traccia in una singola traccia e li ordina in base all&apos;orario. I punti con lo stesso orario saranno tralasciati. </translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="228"/>
+        <location filename="trackui.ui" line="292"/>
         <source>Merge</source>
         <translation>Unisci</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="235"/>
+        <location filename="trackui.ui" line="299"/>
         <source>Split by Date</source>
         <translation>Suddividi per data</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="242"/>
+        <location filename="trackui.ui" line="306"/>
         <source>Split by Time</source>
         <translation>Suddividi per ora</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="254"/>
+        <location filename="trackui.ui" line="318"/>
         <source>If nonzero, the track will be split if the time between two points is greater than this parameter.   If zero, the track will be split by date. </source>
         <translation>Se diverso da zero, la traccia verrà suddivisa se il tempo tra due punti è maggiore di questo parametro.   Se zero, la traccia verrà suddivisa in base al giorno. </translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="270"/>
+        <location filename="trackui.ui" line="334"/>
         <source>hrs</source>
         <translation>ore</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="285"/>
+        <location filename="trackui.ui" line="349"/>
         <source>Split by Dist.</source>
         <translation>Suddividi per distanza</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="297"/>
+        <location filename="trackui.ui" line="361"/>
         <source>If nonzero, the input track will be split into several tracks if the distance between successive track points is greater than the distance given as a parameter. </source>
         <translation>Se non zero, la traccia in ingresso verrà suddivisa in più tracce se la distanza tra punti traccia successivi è maggiore della distanza specificata nel parametro. </translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="308"/>
+        <location filename="trackui.ui" line="372"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="313"/>
+        <location filename="trackui.ui" line="377"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="318"/>
+        <location filename="trackui.ui" line="382"/>
         <source>km</source>
         <translation>km</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="323"/>
+        <location filename="trackui.ui" line="387"/>
         <source>mi</source>
         <translation>mi</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="341"/>
+        <location filename="trackui.ui" line="405"/>
         <source>GPS Fixes</source>
         <translation>Stato del GPS</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="349"/>
+        <location filename="trackui.ui" line="413"/>
         <source>none</source>
         <translation>nessuno</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="354"/>
+        <location filename="trackui.ui" line="418"/>
         <source>pps</source>
         <translation>pps</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="359"/>
+        <location filename="trackui.ui" line="423"/>
         <source>dgps</source>
         <translation>dgps</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="364"/>
+        <location filename="trackui.ui" line="428"/>
         <source>3d</source>
         <translation>3d</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="369"/>
+        <location filename="trackui.ui" line="433"/>
         <source>2d</source>
         <translation>2d</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="392"/>
+        <location filename="trackui.ui" line="456"/>
         <source>Synthesize speed. </source>
         <translation>Sintetizza la velocità. </translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="395"/>
+        <location filename="trackui.ui" line="459"/>
         <source>Synthesize speed.
 
-This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don&apos;t support speed information or for trackoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of &quot;unknown.&quot; </source>
+This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don&apos;t support speed information or for trackpoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of &quot;unknown.&quot; </source>
         <translation>Sintetizza la velocità.
 
 Questa opzione calcola il valore della velocità GPS in ogni punto traccia. Risulta utile soprattutto con punti traccia tratti da un formato che non specifica informazioni sulla velocità o da punti traccia sintetizzati dal filtro di interpolazione. La velocità in ogni punto traccia è la velocità media calcolata dal punto precedente (distanza diviso il tempo). Al primo punto di ogni traccia viene assegnata una velocità &quot;sconosciuta.&quot; </translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="400"/>
+        <location filename="trackui.ui" line="464"/>
         <source>Speed</source>
         <translation>Velocità</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="407"/>
+        <location filename="trackui.ui" line="471"/>
         <source>Synthesize course.</source>
         <translation>Sintetizza la direzione.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="410"/>
+        <location filename="trackui.ui" line="474"/>
         <source>Synthesize course.
 
 This option computes (or recomputes) a value for the GPS heading at each trackpoint. This is most useful with trackpoints from formats that don&apos;t support heading information or for trackpoints synthesized by the interpolate filter. The heading at each trackpoint is simply the course from the previous trackpoint in the track. The first trackpoint in each track is arbitrarily assigned a heading of 0 degrees. </source>
@@ -1497,7 +1502,7 @@ This option computes (or recomputes) a value for the GPS heading at each trackpo
 Questa opzione calcola (o ricalcola) un valore per la direzione del GPS in ogni punto traccia. Risulta utile soprattutto con punti traccia tratti da un formato che non specifica informazioni sulla direzione o da punti traccia sintetizzati dal filtro di interpolazione. La direzione in ogni punto traccia è tratta semplicemente dalla posizione del punto traccia precedente nella traccia stessa. Al primo punto di ogni traccia viene arbitrariamente assegnato un valore pari a 0 gradi. </translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="415"/>
+        <location filename="trackui.ui" line="479"/>
         <source>Course</source>
         <translation>Direzione</translation>
     </message>

diff --git a/gui/gpsbabelfe_ru.qm b/gui/gpsbabelfe_ru.qm
index a4e68652de6e02c354ea0c997c80f4645312341c..9e7950dc314608e9a7d887da7a632f7bc149eb59 100644 (file)
Binary files a/gui/gpsbabelfe_ru.qm and b/gui/gpsbabelfe_ru.qm differ

diff --git a/gui/gpsbabelfe_ru.ts b/gui/gpsbabelfe_ru.ts
index fa8042215cca159f4fe56e1ccb2b707be875c451..76cc1ecdaa4da9393074807a281d8a524c473273 100644 (file)
--- a/gui/gpsbabelfe_ru.ts
+++ b/gui/gpsbabelfe_ru.ts
@@ -106,7 +106,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="advui.ui" line="52"/>
         <source>Debugging diagnostics.  
-Higher number provides more deitaled diagnostics.</source>
+Higher number provides more detailed diagnostics.</source>
         <translation>Отладочная диагностика.  
 Чем выше номер, тем больше деталей.</translation>
     </message>
@@ -686,17 +686,17 @@ p, li { white-space: pre-wrap; }
         <translation type="obsolete">по умолчанию</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="565"/>
+        <location filename="mainwindow.cc" line="563"/>
         <source>Select one or more input files</source>
         <translation>Выберите один или несколько файлов</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="593"/>
+        <location filename="mainwindow.cc" line="591"/>
         <source>Output File Name</source>
         <translation>Имя выходного файла</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="657"/>
+        <location filename="mainwindow.cc" line="655"/>
         <source>Error reading format configuration.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
@@ -705,7 +705,7 @@ This program cannot continue.</source>
 Выполнение программы не может быть продолжено.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="668"/>
+        <location filename="mainwindow.cc" line="666"/>
         <source>Some file/device formats were not found during initialization.  Check that the backend program &quot;gpsbabel&quot; is properly installed and is in the current PATH
 
 This program cannot continue.</source>
@@ -714,7 +714,7 @@ This program cannot continue.</source>
 Выполнение программы не может быть продолжено.</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="689"/>
+        <location filename="mainwindow.cc" line="687"/>
         <source>Input and output formats do not support %1</source>
         <translation>Входной и выходной форматы не поддерживают %1</translation>
     </message>
@@ -727,109 +727,109 @@ This program cannot continue.</source>
         <translation type="vanished">Входной формат поддерживает %1; выходной формат не поддерживаетt %2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="692"/>
+        <location filename="mainwindow.cc" line="690"/>
         <source>Input does not support %1; output format supports %1</source>
         <translation type="unfinished">Входной формат не поддерживает %1; выходной формат поддерживает %1 {1;?}</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="695"/>
+        <location filename="mainwindow.cc" line="693"/>
         <source>Input format supports %1; output format does not support %1</source>
         <translation type="unfinished">Входной формат поддерживает %1; выходной формат не поддерживаетt %1 {1;?}</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="698"/>
+        <location filename="mainwindow.cc" line="696"/>
         <source>Both input and output formats support %1</source>
         <translation>Входной и выходной формат поддерживают %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="719"/>
+        <location filename="mainwindow.cc" line="717"/>
         <source>waypoints</source>
         <translation>маршрутные точки</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="720"/>
+        <location filename="mainwindow.cc" line="718"/>
         <source>tracks</source>
         <translation>треки</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="721"/>
+        <location filename="mainwindow.cc" line="719"/>
         <source>routes</source>
         <translation>маршруты</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="816"/>
+        <location filename="mainwindow.cc" line="814"/>
         <source>There are no input options for format &quot;%1&quot;</source>
         <translation>Нет входных параметров для формата &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="822"/>
-        <location filename="mainwindow.cc" line="841"/>
+        <location filename="mainwindow.cc" line="820"/>
+        <location filename="mainwindow.cc" line="839"/>
         <source>Options for %1</source>
         <translation>Параметры %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="835"/>
+        <location filename="mainwindow.cc" line="833"/>
         <source>There are no output options for format &quot;%1&quot;</source>
         <translation>Нет выходных параметров для формата &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="855"/>
+        <location filename="mainwindow.cc" line="853"/>
         <source>No valid waypoints/routes/tracks translation specified</source>
         <translation>Не выбрано преобразование маршрутных точек/маршрутов/треков</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="874"/>
+        <location filename="mainwindow.cc" line="872"/>
         <source>No input file specified</source>
         <translation>Не выбран входной файл</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="881"/>
+        <location filename="mainwindow.cc" line="879"/>
         <source>No valid output specified</source>
         <translation>Не выбран выходной файл</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="886"/>
+        <location filename="mainwindow.cc" line="884"/>
         <source>No output file specified</source>
         <translation>Не выбран выходной файл</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="902"/>
+        <location filename="mainwindow.cc" line="900"/>
         <source>Process &quot;%1&quot; did not start</source>
         <translation>Процесс &quot;%1&quot; не запустился</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="916"/>
+        <location filename="mainwindow.cc" line="914"/>
         <source>Process exited unsuccessfully with code %1</source>
         <translation>Процесс завершился неудачей с кодом %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1058"/>
+        <location filename="mainwindow.cc" line="1056"/>
         <source>Translation successful</source>
         <translation>Конвертация выполнена</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1068"/>
+        <location filename="mainwindow.cc" line="1066"/>
         <source>Error running gpsbabel: %1
 </source>
         <translation>Ошибка запуска gpsbabel: %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1188"/>
+        <location filename="mainwindow.cc" line="1186"/>
         <source>Are you sure you want to reset all format options to default values?</source>
         <translation>Вы действительно желаете сбросить все параметры формата в значения по умолчанию?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1212"/>
+        <location filename="mainwindow.cc" line="1210"/>
         <source>About %1</source>
         <translation>О %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1255"/>
+        <location filename="mainwindow.cc" line="1253"/>
         <source>One or more data filters are active</source>
         <translation>Один или более фильтров данных активны</translation>
     </message>
     <message>
-        <location filename="mainwindow.cc" line="1257"/>
+        <location filename="mainwindow.cc" line="1255"/>
         <source>No data filters are active</source>
         <translation>Фильтры данных не активны</translation>
     </message>
@@ -866,28 +866,28 @@ This program cannot continue.</source>
     </message>
     <message>
         <location filename="miscfltui.ui" line="90"/>
-        <location filename="filterwidgets.cc" line="225"/>
-        <location filename="filterwidgets.cc" line="226"/>
         <location filename="filterwidgets.cc" line="227"/>
         <location filename="filterwidgets.cc" line="228"/>
+        <location filename="filterwidgets.cc" line="229"/>
+        <location filename="filterwidgets.cc" line="230"/>
         <source>Routes</source>
         <translation>Маршруты</translation>
     </message>
     <message>
         <location filename="miscfltui.ui" line="97"/>
-        <location filename="filterwidgets.cc" line="224"/>
-        <location filename="filterwidgets.cc" line="225"/>
-        <location filename="filterwidgets.cc" line="228"/>
-        <location filename="filterwidgets.cc" line="229"/>
+        <location filename="filterwidgets.cc" line="226"/>
+        <location filename="filterwidgets.cc" line="227"/>
+        <location filename="filterwidgets.cc" line="230"/>
+        <location filename="filterwidgets.cc" line="231"/>
         <source>Tracks</source>
         <translation>Треки</translation>
     </message>
     <message>
         <location filename="miscfltui.ui" line="104"/>
-        <location filename="filterwidgets.cc" line="224"/>
         <location filename="filterwidgets.cc" line="226"/>
-        <location filename="filterwidgets.cc" line="227"/>
+        <location filename="filterwidgets.cc" line="228"/>
         <location filename="filterwidgets.cc" line="229"/>
+        <location filename="filterwidgets.cc" line="231"/>
         <source>Waypoints</source>
         <translation>Маршрутные точки</translation>
     </message>
@@ -1093,13 +1093,13 @@ Some GPS data formats support only some subset of waypoints, tracks, and routes.
         <translation>Остановить процесс</translation>
     </message>
     <message>
-        <location filename="processwait.cc" line="156"/>
+        <location filename="processwait.cc" line="157"/>
         <source>Process did not terminate successfully</source>
         <translation>Процесс завершился неудачей</translation>
     </message>
     <message>
-        <location filename="processwait.cc" line="175"/>
-        <source>Process crashed whle running</source>
+        <location filename="processwait.cc" line="176"/>
+        <source>Process crashed while running</source>
         <translation>Неудача в процессе исполнения</translation>
     </message>
 </context>
@@ -1192,7 +1192,7 @@ The quality of the results will vary depending on the density of points in the o
     </message>
     <message>
         <location filename="rttrkui.ui" line="121"/>
-        <source>The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a wierd thing and place each waypoint on a separate day. 
+        <source>The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a weird thing and place each waypoint on a separate day. 
 Additionally, if you&apos;re using this to reverse a route that navigates, say, an exit ramp or a one way street, you will be in for unpleasant ride. application cares about timestamps </source>
         <translation>Разворот производится самым примитивным путем. Оригинальные точки сохраняют временные метки, так что результирующий трек или маршрут будет идти назад во времени. Это может заставить некоторые приборы, такие как в особенности Magellan Mapsend, вести себя странным образом и помещать каждую точку в отдельный день.
 Дополнительно, вы можете оказаться в неудобной ситуации, если используете такой маршрут для навигации по развязке или по улице с односторонним движением. Приложение следит за временными метками </translation>
@@ -1262,35 +1262,40 @@ This option changes the time of all trackpoints. This might be useful if your tr
         <translation>Сдвинуть</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="83"/>
-        <location filename="trackui.ui" line="275"/>
+        <location filename="trackui.ui" line="93"/>
+        <source>weeks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="trackui.ui" line="117"/>
+        <location filename="trackui.ui" line="339"/>
         <source>days</source>
         <translation>дней</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="97"/>
+        <location filename="trackui.ui" line="141"/>
         <source>hours</source>
         <translation>ч</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="111"/>
-        <location filename="trackui.ui" line="265"/>
+        <location filename="trackui.ui" line="165"/>
+        <location filename="trackui.ui" line="329"/>
         <source>mins</source>
         <translation>мин</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="125"/>
+        <location filename="trackui.ui" line="189"/>
         <source>secs</source>
         <translation>с</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="140"/>
-        <location filename="trackui.ui" line="155"/>
+        <location filename="trackui.ui" line="204"/>
+        <location filename="trackui.ui" line="219"/>
         <source>Use track pts. after this time. </source>
         <translation>Использовать точки трека после этого времени.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="143"/>
+        <location filename="trackui.ui" line="207"/>
         <source>Use only track points after this timestamp.
 
 This option is used along with the stop to discard trackpoints that were recorded outside of a specific period of time. This option specifies the beginning of the time period. </source>
@@ -1299,33 +1304,33 @@ This option is used along with the stop to discard trackpoints that were recorde
 Этот параметр используется вместе со временем окончания, чтобы удалить точки трека, полученные вне заданного временного диапазона. Этот параметр задает начало диапазона.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="148"/>
+        <location filename="trackui.ui" line="212"/>
         <source>Start</source>
         <translation>Начало</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="162"/>
+        <location filename="trackui.ui" line="226"/>
         <source>If checked, time specified here is based on this computer&apos;s current time zone. </source>
         <translation>Если включено, то время, указанное здесь, соответствует времени, указанному на компьютере.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="165"/>
+        <location filename="trackui.ui" line="229"/>
         <source>If checked, the times specified here are based on the local computer&apos;s time zone.  Otherwise it is UTC.</source>
         <translation>Если включено, то время, указанное здесь, соответствует времени, указанному на компьютере. Иначе - UTC.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="168"/>
+        <location filename="trackui.ui" line="232"/>
         <source>Local Time</source>
         <translation>Местное время</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="181"/>
-        <location filename="trackui.ui" line="196"/>
+        <location filename="trackui.ui" line="245"/>
+        <location filename="trackui.ui" line="260"/>
         <source>Use track pts before this time. </source>
         <translation>Использовать точки трека до этого времени.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="184"/>
+        <location filename="trackui.ui" line="248"/>
         <source> Use only track points before this timestamp.
 
 This option is used in conjunction with the start option to discard all trackpoints outside of a given period of time. This option defines the end of the time period. </source>
@@ -1334,17 +1339,17 @@ This option is used in conjunction with the start option to discard all trackpoi
 Этот параметр используется вместе со временем начала, чтобы удалить точки трека полученные вне заданного временного диапазона. Этот параметр задает конец диапазона.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="189"/>
+        <location filename="trackui.ui" line="253"/>
         <source>Stop</source>
         <translation>Конец</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="203"/>
+        <location filename="trackui.ui" line="267"/>
         <source>Pack all tracks into one. </source>
         <translation>Упаковать все треки в один.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="206"/>
+        <location filename="trackui.ui" line="270"/>
         <source>Pack all tracks into one.
 
 This option causes all tracks to be appended to one another to form a single track. This option does not work if any two tracks overlap in time; in that case, consider using the merge option.
@@ -1357,17 +1362,17 @@ This option is most useful for rejoining tracks that might have been interrupted
 Полезен для объединения треков, которые могли быть разорваны из-за перебоев в работе прибора или остановки на ночь.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="213"/>
+        <location filename="trackui.ui" line="277"/>
         <source>Pack</source>
         <translation>Упаковать</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="220"/>
+        <location filename="trackui.ui" line="284"/>
         <source>Merge multiple tracks for the same way.</source>
         <translation>Склеить несколько треков для того же пути.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="223"/>
+        <location filename="trackui.ui" line="287"/>
         <source> Merge multiple tracks for the same way.
 
 This option puts all track points from all tracks into a single track and sorts them by time stamp. Points with identical time stamps will be dropped. </source>
@@ -1376,116 +1381,116 @@ This option puts all track points from all tracks into a single track and sorts
 Этот параметр складывает все точки трека из всех треков в единый трек и сортирует их по временным меткам. Точки с одинаковыми метками - удаляются.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="228"/>
+        <location filename="trackui.ui" line="292"/>
         <source>Merge</source>
         <translation>Склеить</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="235"/>
+        <location filename="trackui.ui" line="299"/>
         <source>Split by Date</source>
         <translation>Разбить по дате</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="242"/>
+        <location filename="trackui.ui" line="306"/>
         <source>Split by Time</source>
         <translation>Разбить по времени</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="254"/>
+        <location filename="trackui.ui" line="318"/>
         <source>If nonzero, the track will be split if the time between two points is greater than this parameter.   If zero, the track will be split by date. </source>
         <translation>Если не 0, трек будет разбит если время между двумя точками больше, чем это значение. Если ноль, трек будет разбит по дате.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="270"/>
+        <location filename="trackui.ui" line="334"/>
         <source>hrs</source>
         <translation>ч</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="285"/>
+        <location filename="trackui.ui" line="349"/>
         <source>Split by Dist.</source>
         <translation>Разбить по расстоянию</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="297"/>
+        <location filename="trackui.ui" line="361"/>
         <source>If nonzero, the input track will be split into several tracks if the distance between successive track points is greater than the distance given as a parameter. </source>
         <translation>Если не 0, исходный трек будет разбит на несколько треков если расстояние между последовательными точками больше, чем заданное.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="308"/>
+        <location filename="trackui.ui" line="372"/>
         <source>ft</source>
         <translation>футов</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="313"/>
+        <location filename="trackui.ui" line="377"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="318"/>
+        <location filename="trackui.ui" line="382"/>
         <source>km</source>
         <translation>км</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="323"/>
+        <location filename="trackui.ui" line="387"/>
         <source>mi</source>
         <translation>миль</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="341"/>
+        <location filename="trackui.ui" line="405"/>
         <source>GPS Fixes</source>
         <translation>GPS поправки</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="349"/>
+        <location filename="trackui.ui" line="413"/>
         <source>none</source>
         <translation>нет</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="354"/>
+        <location filename="trackui.ui" line="418"/>
         <source>pps</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="359"/>
+        <location filename="trackui.ui" line="423"/>
         <source>dgps</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="364"/>
+        <location filename="trackui.ui" line="428"/>
         <source>3d</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="369"/>
+        <location filename="trackui.ui" line="433"/>
         <source>2d</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="392"/>
+        <location filename="trackui.ui" line="456"/>
         <source>Synthesize speed. </source>
         <translation>Синтезировать скорость.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="395"/>
+        <location filename="trackui.ui" line="459"/>
         <source>Synthesize speed.
 
-This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don&apos;t support speed information or for trackoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of &quot;unknown.&quot; </source>
+This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don&apos;t support speed information or for trackpoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of &quot;unknown.&quot; </source>
         <translation>Синтезировать скорость.
 
 Эта опция позволяет вычислить значение скорости в каждой точке трека. Это может понадобится для форматов, не поддерживающих скорость, или для точек, синтезированных фильтром интерполяции. Скорость в каждой точке является средней скоростью от предыдущей точки трека (расстояние, деленное на время). Первая точка каждого трека получает значение &quot;unknown.&quot;</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="400"/>
+        <location filename="trackui.ui" line="464"/>
         <source>Speed</source>
         <translation>Скорость</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="407"/>
+        <location filename="trackui.ui" line="471"/>
         <source>Synthesize course.</source>
         <translation>Синтезировать курс.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="410"/>
+        <location filename="trackui.ui" line="474"/>
         <source>Synthesize course.
 
 This option computes (or recomputes) a value for the GPS heading at each trackpoint. This is most useful with trackpoints from formats that don&apos;t support heading information or for trackpoints synthesized by the interpolate filter. The heading at each trackpoint is simply the course from the previous trackpoint in the track. The first trackpoint in each track is arbitrarily assigned a heading of 0 degrees. </source>
@@ -1494,7 +1499,7 @@ This option computes (or recomputes) a value for the GPS heading at each trackpo
 Эта опция позволяет вычислить (или пересчитать) значение для курса GPS в каждой точке трека. Это может понадобится для форматов, не поддерживающих азимут или для точек, синтезированных фильтром интерполяции. Азимут в каждой точке является простым углом от предыдущей точки трека. Первая точка каждого трека получает значение 0 градусов.</translation>
     </message>
     <message>
-        <location filename="trackui.ui" line="415"/>
+        <location filename="trackui.ui" line="479"/>
         <source>Course</source>
         <translation>Курс</translation>
     </message>

diff --git a/gui/latlng.cc b/gui/latlng.cc
index 1cc2e0bb3bf479281c943237d4fbc87188fcc881..7483665276e8399f6aad44c4755611f7258431f1 100644 (file)
--- a/gui/latlng.cc
+++ b/gui/latlng.cc
@@ -49,10 +49,10 @@ static double ArcInRadians(const LatLng& from, const LatLng& to)
   double longitudeArc = (from.lng() - to.lng()) * DEG_TO_RAD;
   double latitudeH = sin(latitudeArc * 0.5);
   latitudeH *= latitudeH;
-  double lontitudeH = sin(longitudeArc * 0.5);
-  lontitudeH *= lontitudeH;
+  double longitudeH = sin(longitudeArc * 0.5);
+  longitudeH *= longitudeH;
   double tmp = cos(from.lat()*DEG_TO_RAD) * cos(to.lat()*DEG_TO_RAD);
-  return 2.0 * asin(sqrt(latitudeH + tmp*lontitudeH));
+  return 2.0 * asin(sqrt(latitudeH + tmp*longitudeH));
 }
 
 /** @brief Computes the distance, in meters, between two WGS-84 positions.

diff --git a/gui/map.cc b/gui/map.cc
index 968d05a26e942f29769dde2cb45b7262289748b0..9efeb6e09c2da18a51e4d37d5e5e69f0a42fedad 100644 (file)
--- a/gui/map.cc
+++ b/gui/map.cc
@@ -78,7 +78,7 @@ Map::Map(QWidget* parent,
   manager_ = new QNetworkAccessManager(this);
   connect(this,SIGNAL(loadFinished(bool)),
           this,SLOT(loadFinishedX(bool)));
-  this->logTime("Start map constuctor");
+  this->logTime("Start map constructor");
 
 #if HAVE_WEBENGINE
   MarkerClicker* mclicker = new MarkerClicker(this);

diff --git a/gui/processwait.cc b/gui/processwait.cc
index 8ae5806f4479337a0ddb9662dc5d1efcc5763b87..93bb4d20668b221d42b6fee00e1eed858e544204 100644 (file)
--- a/gui/processwait.cc
+++ b/gui/processwait.cc
@@ -173,7 +173,7 @@ void ProcessWaitDialog::finishedX(int exitCode, QProcess::ExitStatus es)
 {
   ecode_ = exitCode;
   if (es == QProcess::CrashExit) {
-    errorString_ = QString(tr("Process crashed whle running"));
+    errorString_ = QString(tr("Process crashed while running"));
   }
   timer_->stop();
   accept();

diff --git a/gui/rttrkui.ui b/gui/rttrkui.ui
index 999c2c04e4e3e888edd17afd70c7782a51813b07..7ccad8db593afa4c5c3801083d8d541f4b1890a5 100644 (file)
--- a/gui/rttrkui.ui
+++ b/gui/rttrkui.ui
@@ -118,7 +118,7 @@ The quality of the results will vary depending on the density of points in the o
       <string>Reverse tracks and routes</string>
      </property>
      <property name="whatsThis">
-      <string>The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a wierd thing and place each waypoint on a separate day. 
+      <string>The reversal is performed in the laziest way possible. Timestamps are kept with the original waypoints so the resulting track or route will have the interesting characteristic that time runs backwards. This tends to make Magellan Mapsend, in particular, do a weird thing and place each waypoint on a separate day. 
 Additionally, if you're using this to reverse a route that navigates, say, an exit ramp or a one way street, you will be in for unpleasant ride. application cares about timestamps </string>
      </property>
      <property name="text">

diff --git a/gui/serial_mac.cc b/gui/serial_mac.cc
index e5055ad7ecd0de1fe7f75cb002298cdf63d503f9..69fa90b3c0207790e0021e86d9867c181492dfff 100644 (file)
--- a/gui/serial_mac.cc
+++ b/gui/serial_mac.cc
@@ -1,6 +1,6 @@
 // Borrowed liberally (as allowed by license) from
 // http://developer.apple.com/samplecode/SerialPortSample/index.html
-// This really is a slash-and-burn; no attempt was to make it very "C++-iike"
+// This really is a slash-and-burn; no attempt was to make it very "C++-like"
 
 // Apple's copyright blob:
 /*

diff --git a/gui/serial_win.cc b/gui/serial_win.cc
index 1cf689b34342db3c1ef001d5f54733cd402a5dc2..e4870775e205f71609681cf6c9aaaa02195e582e 100644 (file)
--- a/gui/serial_win.cc
+++ b/gui/serial_win.cc
@@ -49,12 +49,12 @@ void MainWindow::osLoadDeviceNameCombos(QComboBox* box)
   char DevList[64*1024-1];  // a single byte more, and certain versions of windows
   // always return QueryDosDevice()==0 && GetLastError()==ERROR_MORE_DATA.
   // see http://support.microsoft.com/kb/931305
-  // Get a list of all existing MS-DOS device names. Stores one or more asciiz strings followed by an extra null.
+  // Get a list of all existing MS-DOS device names. Stores one or more ASCII strings followed by an extra null.
   DWORD res = QueryDosDeviceA(NULL, DevList, sizeof(DevList));
   if (res == 0) {
     DWORD err = GetLastError(); // could check for ERROR_INSUFFICIENT_BUFFER, and retry with a larger buffer.
     // but DevList is already at the maximum size it can be without running into kb 931305.
-    // FIXME: This shold be a QMessageBox::warning() - RJL
+    // FIXME: This should be a QMessageBox::warning() - RJL
     // fprintf(stderr,"QueryDosDevice() failed with %d.  GetLastError()==%d.\n", res, err);
     (void) err;
     return;

diff --git a/gui/trackui.ui b/gui/trackui.ui
index 172b7b04dfbc25a2bcd2c7f79b94c3a025621f92..2cbea7971dd19dfcb0ec6fbe25f095cc9d53515c 100644 (file)
--- a/gui/trackui.ui
+++ b/gui/trackui.ui
@@ -458,7 +458,7 @@ This option puts all track points from all tracks into a single track and sorts
        <property name="whatsThis">
         <string>Synthesize speed.
 
-This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don't support speed information or for trackoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of &quot;unknown.&quot; </string>
+This option computes a value for the GPS speed at each trackpoint. This is most useful with trackpoints from formats that don't support speed information or for trackpoints synthesized by the interpolate filter. The speed at each trackpoint is the average speed from the previous trackpoint (distance divided by time). The first trackpoint in each track is assigned a speed of &quot;unknown.&quot; </string>
        </property>
        <property name="text">
         <string>Speed</string>

diff --git a/gui/upgrade.cc b/gui/upgrade.cc
index 0ba4da106f3dc6adc793776ee4d74ebdef039d32..5812282131643a86d66e8d374eea50a52c0715a2 100644 (file)
--- a/gui/upgrade.cc
+++ b/gui/upgrade.cc
@@ -174,7 +174,7 @@ UpgradeCheck::updateStatus UpgradeCheck::getStatus()
 // and are stored as strings. They may be of the form "1.6.0-beta20200413" 
 // which, if sorted as a string, will be after "1.6.0" which is bad. Use
 // this function to sort that out. (See what I did there? Bwaaaahah!) 
-bool UpgradeCheck::suggestUpgrade(QString from, QString to) 
+bool UpgradeCheck::suggestUpgrade(const QString& from, const QString& to) 
 {
   int fromIndex = 0;
   int toIndex = 0;
@@ -234,7 +234,7 @@ void UpgradeCheck::httpRequestFinished(QNetworkReply* reply)
         qDebug() << "redirect to " << redirectUrl.toString();
       }
       // Change the url for the next update check.
-      // TOODO: kick off another update check.
+      // TODO: kick off another update check.
       upgradeUrl_ = redirectUrl;
       replyId_ = nullptr;
       reply->deleteLater();

diff --git a/gui/upgrade.h b/gui/upgrade.h
index 7ca4c12f69050b1d295d0fef7c0c59be35cbc397..f399938084021b3203e782aa31136a8c6a40d1df 100644 (file)
--- a/gui/upgrade.h
+++ b/gui/upgrade.h
@@ -63,7 +63,7 @@ private:
   QString getOsName();
   QString getOsVersion();
   QString getCpuArchitecture();
-  bool suggestUpgrade(QString from, QString to);
+  bool suggestUpgrade(const QString& from, const QString& to);
 
 private slots:
   void httpRequestFinished(QNetworkReply* reply);